From f8c35cad3842a60181281278a4f7e02e7e69fa64 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 4 Sep 2020 19:10:06 +1200 Subject: [PATCH] dev/core#1998 Address dedupe clash on dashboard contact --- CRM/Dedupe/Merger.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index d8fd267310..69827f1619 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -541,6 +541,12 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m continue; } + if ($table === 'civicrm_dashboard_contact') { + $sqls[] = "UPDATE IGNORE civicrm_dashboard_contact SET contact_id = $mainId WHERE contact_id = $otherId"; + $sqls[] = "DELETE FROM civicrm_dashboard_contact WHERE contact_id = $otherId"; + continue; + } + if ($table === 'civicrm_dedupe_exception') { $sqls[] = "UPDATE IGNORE civicrm_dedupe_exception SET contact_id1 = $mainId WHERE contact_id1 = $otherId"; $sqls[] = "UPDATE IGNORE civicrm_dedupe_exception SET contact_id2 = $mainId WHERE contact_id2 = $otherId"; -- 2.25.1