X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FDedupe%2FMerger.php;h=8566e7a18344904072fd4fd2c95875ece70b70ad;hb=f38178e6aa43297ef8b9e08ca1bcb6bd49c81473;hp=a49f15c5467dcf1399bd0f11d9e25204875eabc8;hpb=c15fb38374462a40d704d83fac983412df8a16a1;p=civicrm-core.git diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index a49f15c546..8566e7a183 100644 --- 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, - // failing to meet intended result. Therefore we introduce this additonal query: + // failing to meet intended result. Therefore we introduce this additional query: $sqls[] = "DELETE FROM civicrm_uf_match WHERE contact_id = {$mainId}"; break; }