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:
d52fb58
)
dev/core#2549
author
Samuel Vanhove
<samuel@symbiotic.coop>
Thu, 22 Jun 2023 17:49:18 +0000
(13:49 -0400)
committer
Samuel Vanhove
<samuel@symbiotic.coop>
Thu, 22 Jun 2023 17:49:18 +0000
(13:49 -0400)
CRM/Dedupe/Merger.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Dedupe/Merger.php
b/CRM/Dedupe/Merger.php
index 99fd822328457ab6fac83f62584aaf8fef5b2665..d9615d2fbde488e8b87bb80bb3df36100b2604e7 100644
(file)
--- a/
CRM/Dedupe/Merger.php
+++ b/
CRM/Dedupe/Merger.php
@@
-266,7
+266,8
@@
class CRM_Dedupe_Merger {
public static function locTables() {
static $locTables;
if (!$locTables) {
- $locTables = ['civicrm_email', 'civicrm_address', 'civicrm_phone'];
+ // should be in sync with getLocationBlockInfo
+ $locTables = ['civicrm_email', 'civicrm_address', 'civicrm_phone', 'civicrm_im', 'civicrm_website'];
// Allow hook_civicrm_merge() to adjust $locTables
CRM_Utils_Hook::merge('locTables', $locTables);