additional fixes

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 227bc194ca66873c0d43808aeccfce6d867235b5..49397fc8dc90e73faefcbadb1100c78cf7d62b76 100644 (file)
--- 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;
     }