Merge pull request #9287 from francescbassas/patch-9

CRM-19313 - Can't assign custom group to relationships with two conta…
civicrm · Oct 18, 2016 · 5f61a5f · 5f61a5f
2 parents d72b62e + 4091c7e
commit 5f61a5f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
@@ -509,7 +509,7 @@ public static function dataExists(&$params) {
    * @param string $column
    *   Name/label that going to retrieve from db.
    * @param bool $biDirectional
-   * @param string $contactSubType
+   * @param array $contactSubType
    *   Includes relationship types between this subtype.
    * @param bool $onlySubTypeRelationTypes
    *   If set only subtype which is passed by $contactSubType
@@ -551,7 +551,9 @@ public static function getContactRelationshipType(
       }
     }
 
-    $contactSubType = array();
+    if (empty($contactSubType)) {
+      $contactSubType = array();
+    }
     if ($contactId) {
       $contactType = CRM_Contact_BAO_Contact::getContactType($contactId);
       $contactSubType = CRM_Contact_BAO_Contact::getContactSubType($contactId);