From 91244f1d052920c11a4bb0566c6a58236404d6fc Mon Sep 17 00:00:00 2001 From: atif-shaikh Date: Wed, 1 Apr 2015 12:43:28 +0530 Subject: [PATCH] CRM-16087 - Relation Api test break fix ---------------------------------------- * CRM-16087: Changes in relationship status are not invoking updates to membership status https://issues.civicrm.org/jira/browse/CRM-16087 --- CRM/Contact/BAO/Relationship.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 973e870841..7a923c7fac 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -75,7 +75,8 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { $action = CRM_Core_Action::ENABLE; $active = TRUE; } - self::disableEnableRelationship($params['id'], $action, $params, $ids, $active); + $id = empty($params['id']) ? $relationship->id : $params['id']; + self::disableEnableRelationship($id, $action, $params, $ids, $active); } self::addRecent($params, $relationship); @@ -705,7 +706,7 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { ); } elseif ($action & CRM_Core_Action::ENABLE) { - $ids['contact'] = $relationship->contact_id_a; + $ids['contact'] = empty($ids['contact']) ? $contact_id_a : $ids['contact']; CRM_Contact_BAO_Relationship::relatedMemberships($contact_id_a, $params, $ids, -- 2.25.1