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

diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
index 973e870841522d39af6e2372b21188bb1eba2ba9..7a923c7fac36af3a0e757b7a15d9551e253275ca 100644 (file)
--- 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,