projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5caa4da
)
change is_override logic
author
Stoob
<stuart@korlon.com>
Mon, 15 Apr 2019 23:08:15 +0000
(16:08 -0700)
committer
GitHub
<noreply@github.com>
Mon, 15 Apr 2019 23:08:15 +0000
(16:08 -0700)
if (!$dao->is_override was prior code. IS NOT NULL not functional equivalent
CRM/Member/BAO/Membership.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Member/BAO/Membership.php
b/CRM/Member/BAO/Membership.php
index b359fdd15d0ba945199e0d472f4a80cc6e6b5fc4..ced0eb3928cb203f6cb23b1a6f757237c8a3539f 100644
(file)
--- a/
CRM/Member/BAO/Membership.php
+++ b/
CRM/Member/BAO/Membership.php
@@
-2272,7
+2272,7
@@
WHERE civicrm_membership.is_test = 0
self::processOverriddenUntilDateMembership($dao1);
}
- $query = $baseQuery . " AND civicrm_membership.is_override
IS NULL
+ $query = $baseQuery . " AND civicrm_membership.is_override
!= 1
AND civicrm_membership.status_id NOT IN (%1, %2, %3, %4)
AND civicrm_membership.owner_membership_id IS NULL ";
$params = array(