X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=api%2Fv3%2FRelationship.php;h=b36069a41001b89493b1da71fafdfc8b0b59f92a;hb=79cffafae988e139ad14440c7502710a23ac15fa;hp=0e754690da2b052f46df95cec2c02624c9f4355e;hpb=9ba1ce64b802496d917beb752c1bbba148ce4546;p=civicrm-core.git

diff --git a/api/v3/Relationship.php b/api/v3/Relationship.php
index 0e754690da..b36069a410 100644
--- a/api/v3/Relationship.php
+++ b/api/v3/Relationship.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -56,7 +56,7 @@ function civicrm_api3_relationship_create($params) {
   _civicrm_api3_relationship_format_params($params, $values);
   $ids = array();
 
-  if (CRM_Utils_Array::value('id', $params)) {
+  if (!empty($params['id'])) {
     $ids['contactTarget'] = $values['contact_id_b'];
   }
 
@@ -137,7 +137,11 @@ function civicrm_api3_relationship_delete($params) {
  */
 function civicrm_api3_relationship_get($params) {
   $options = _civicrm_api3_get_options_from_params($params);
-  if (!CRM_Utils_Array::value('contact_id', $params)) {
+
+  if (empty($params['contact_id'])) {
+    if(!empty($params['membership_type_id']) && empty($params['relationship_type_id'])) {
+      CRM_Contact_BAO_Relationship::membershipTypeToRelationshipTypes($params);
+    }
     $relationships = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params, FALSE);
   }
   else {
@@ -182,7 +186,7 @@ function _civicrm_api3_relationship_format_params($params, &$values) {
   _civicrm_api3_store_values($fields, $params, $values);
 
   $relationTypes = CRM_Core_PseudoConstant::relationshipType('name');
-  if (CRM_Utils_Array::value('id', $params)) {
+  if (!empty($params['id'])) {
     $relation = new CRM_Contact_BAO_Relationship();
     $relation->id = $params['id'];
     if (!$relation->find(TRUE)) {
@@ -240,7 +244,7 @@ function _civicrm_api3_relationship_format_params($params, &$values) {
         }
 
         if ($relationshipTypeId) {
-          if (CRM_Utils_Array::value('relationship_type_id', $values) &&
+          if (!empty($values['relationship_type_id']) &&
             $relationshipTypeId != $values['relationship_type_id']
           ) {
             throw new Exception('Mismatched Relationship Type and Relationship Type Id');