From adf3128fb32dd8cff27e4f152eea9df51fa2ef5b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Dani=C3=ABl?= <9696905+DanielvV@users.noreply.github.com>
Date: Fri, 29 Sep 2017 11:11:56 +0200
Subject: [PATCH] CRM-21214 - Fix address sharing - undo

---
 CRM/Core/BAO/Address.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 1d06932896..7ba998e403 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -1012,7 +1012,7 @@ SELECT is_primary,
 
     // prevent an endless chain between two shared addresses (prevent chaining 3) CRM-21214
     if (CRM_Utils_Array::value('id', $params) == $params['master_id']) {
-      $params['master_id'] = NULL;
+      $params['master_id'] = '';
       CRM_Core_Session::setStatus(ts("You can't connect an address to itself"), '', 'warning');
     }
   }
-- 
2.25.1