From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 12 Jun 2015 13:03:23 +0000 (+0530)
Subject: additional fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9272d8b59bfaa7740cf65140c193f46a9a2e8290;p=civicrm-core.git

additional fixes
---

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 227bc194ca..49397fc8dc 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -1162,8 +1162,7 @@ SELECT is_primary,
 
     // If already there is a relationship record of $relParam criteria, avoid creating relationship again or else
     // it will casue CRM-16588 as the Duplicate Relationship Exception will revert other contact field values on update
-    $relationship = civicrm_api3('relationship', 'get', $relParam);
-    if (!empty($relationship['values'])) {
+    if (CRM_Contact_BAO_Relationship::checkDuplicateRelationship($relParam, $currentContactId, $sharedContactId)) {
       return;
     }