dev/core#1854: Fix Status Calculation of Overridden Membership Types

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index c927be1aff4a24cb6288002bce62e7b033cce411..f035c74289c49b253ff3e90f5e14a672c7000874 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1429,9 +1429,14 @@ WHERE  civicrm_membership.contact_id = civicrm_contact.id
         $relMembership = new CRM_Member_DAO_Membership();
         $relMembership->contact_id = $contactId;
         $relMembership->owner_membership_id = $membership->id;
+
         if ($relMembership->find(TRUE)) {
           $params['id'] = $relMembership->id;
         }
+        else {
+          unset($params['id']);
+        }
+
         $params['contact_id'] = $contactId;
         $params['owner_membership_id'] = $membership->id;