From 7fe259cd8b6dae39831d47a326b0b9b37b5ed3be Mon Sep 17 00:00:00 2001 From: Stoob Date: Mon, 15 Apr 2019 16:08:15 -0700 Subject: [PATCH] change is_override logic if (!$dao->is_override was prior code. IS NOT NULL not functional equivalent --- CRM/Member/BAO/Membership.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index b359fdd15d..ced0eb3928 100644 --- 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( -- 2.25.1