projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17732 from civicrm/5.27
[civicrm-core.git]
/
CRM
/
Member
/
BAO
/
Membership.php
diff --git
a/CRM/Member/BAO/Membership.php
b/CRM/Member/BAO/Membership.php
index 03961d953e69cd6b4628568f9829a9dd703888e6..c927be1aff4a24cb6288002bce62e7b033cce411 100644
(file)
--- a/
CRM/Member/BAO/Membership.php
+++ b/
CRM/Member/BAO/Membership.php
@@
-1821,8
+1821,8
@@
INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND
if ($contributionRecurID) {
$memParams['contribution_recur_id'] = $contributionRecurID;
}
if ($contributionRecurID) {
$memParams['contribution_recur_id'] = $contributionRecurID;
}
- // @todo stop passing $ids - it is empty
- $membership = self::create($memParams
, $ids
);
+
+ $membership = self::create($memParams);
return [$membership, $renewalMode, $dates];
}
return [$membership, $renewalMode, $dates];
}
@@
-1852,12
+1852,6
@@
INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND
if (!empty($membershipSource)) {
$currentMembership['source'] = $membershipSource;
}
if (!empty($membershipSource)) {
$currentMembership['source'] = $membershipSource;
}
- else {
- $currentMembership['source'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership',
- $currentMembership['id'],
- 'source'
- );
- }
if (!empty($currentMembership['id'])) {
$ids['membership'] = $currentMembership['id'];
if (!empty($currentMembership['id'])) {
$ids['membership'] = $currentMembership['id'];
@@
-1910,10
+1904,6
@@
INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND
}
$memParams['membership_activity_status'] = ($pending || $isPayLater) ? 'Scheduled' : 'Completed';
}
}
$memParams['membership_activity_status'] = ($pending || $isPayLater) ? 'Scheduled' : 'Completed';
}
- //CRM-4555
- if ($pending) {
- $updateStatusId = array_search('Pending', $allStatus);
- }
}
else {
// NEW Membership
}
else {
// NEW Membership