projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5729 from mlutfy/47-crm14588
[civicrm-core.git]
/
CRM
/
Dedupe
/
Merger.php
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index a49f15c5467dcf1399bd0f11d9e25204875eabc8..8566e7a18344904072fd4fd2c95875ece70b70ad 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-403,7
+403,7
@@
INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m
case 'civicrm_uf_match':
// normal queries won't work for uf_match since that will lead to violation of unique constraint,
case 'civicrm_uf_match':
// normal queries won't work for uf_match since that will lead to violation of unique constraint,
- // failing to meet intended result. Therefore we introduce this additonal query:
+ // failing to meet intended result. Therefore we introduce this addit
i
onal query:
$sqls[] = "DELETE FROM civicrm_uf_match WHERE contact_id = {$mainId}";
break;
}
$sqls[] = "DELETE FROM civicrm_uf_match WHERE contact_id = {$mainId}";
break;
}