Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-19-17-34-09

[civicrm-core.git] / CRM / Contact / BAO / Contact.php

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 9959390e6abbb9b907bf64ecb0576e2aaf86e6e9..f3fa846bc0d5f132d32f5ba86acb40412c6e1bae 100644 (file)
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -2587,13 +2587,11 @@ AND       civicrm_openid.is_primary = 1";
 
       case 'rel':
         $result = CRM_Contact_BAO_Relationship::getRelationship($contactId,
-          CRM_Contact_BAO_Relationship::CURRENT,
-          0, 1
+          CRM_Contact_BAO_Relationship::CURRENT
         );
-        return $result;
+        return count($result);
 
       case 'group':
-
         return CRM_Contact_BAO_GroupContact::getContactGroup($contactId, "Added", NULL, TRUE);
 
       case 'log':