From: Elliott Eggleston <ejegg@ejegg.com>
Date: Thu, 25 Aug 2016 19:17:07 +0000 (-0400)
Subject: Fix undefined index notices in merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dc7a41cb6b5037ca532c78920983fef16f931424;p=civicrm-core.git

Fix undefined index notices in merge
---

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index ed55c653fc..a286b2115f 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -963,7 +963,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       if (in_array($field, $keysToIgnore)) {
         continue;
       }
-      if (!empty($value) && $mainAddress[$field] != $value) {
+      if (!empty($value) && isset($mainAddress[$field]) && $mainAddress[$field] != $value) {
         return FALSE;
       }
     }