From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 13 Oct 2016 17:50:01 +0000 (+0100)
Subject: CRM-19148 Fix for on hold data being lost
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=004435298568b2310d5538d5d21dd436d690f2ef;p=civicrm-core.git

CRM-19148 Fix for on hold data being lost
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index b681e97eee..11938d4934 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -929,12 +929,12 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
    * @return bool
    */
   static public function locationIsSame($mainAddress, $comparisonAddress) {
-    $keysToIgnore = array('id', 'is_primary', 'is_billing', 'manual_geo_code', 'contact_id');
+    $keysToIgnore = array('id', 'is_primary', 'is_billing', 'manual_geo_code', 'contact_id', 'reset_date', 'hold_date');
     foreach ($comparisonAddress as $field => $value) {
       if (in_array($field, $keysToIgnore)) {
         continue;
       }
-      if (!empty($value) && isset($mainAddress[$field]) && $mainAddress[$field] != $value) {
+      if ((!empty($value) || $value === '0') && isset($mainAddress[$field]) && $mainAddress[$field] != $value) {
         return FALSE;
       }
     }