From 71cf293e986206c5e99df9f6dd0c8e9f55dd187d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Dani=C3=ABl?= <9696905+DanielvV@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:58:37 +0200
Subject: [PATCH] CRM-21214 - Fix address sharing 1 - undo

This code will not run with the `Address.create` api call
Rewriting and moving to CRM/Core/BAO/Address.php
---
 CRM/Contact/BAO/Contact/Utils.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index ac9b9256ba..024ef85042 100644
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -832,13 +832,6 @@ INNER JOIN civicrm_contact contact_target ON ( contact_target.id = act.contact_i
       $masterAddress->id = CRM_Utils_Array::value('master_id', $values);
       $masterAddress->find(TRUE);
 
-      //if address master address is shared, use its master (prevent chaining) CRM-21214
-      if ($masterAddress->master_id > 0) {
-        $values['master_id'] = $masterAddress->master_id;
-        $masterAddress->id = CRM_Utils_Array::value('master_id', $values);
-        $masterAddress->find(TRUE);
-      }
-
       // 4. modify submitted params and update it with shared contact address
       // make sure you preserve specific form values like location type, is_primary_ is_billing, master_id
       // CRM-10336: Also empty any fields from the existing address block if they don't exist in master (otherwise they will persist)
-- 
2.25.1