projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa48be9
)
Fix undefined index notices in merge
author
Elliott Eggleston
<ejegg@ejegg.com>
Thu, 25 Aug 2016 19:17:07 +0000
(15:17 -0400)
committer
Elliott Eggleston
<ejegg@ejegg.com>
Thu, 25 Aug 2016 19:17:07 +0000
(15:17 -0400)
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index ed55c653fc5ddbca24c1df9728ede059ac96bd6f..a286b2115f918c3949a791f4c6649fde5d291f0f 100644
(file)
--- 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;
}
}