From 46a5c9b7ba4ebcc9b8543bf4490812def9d05464 Mon Sep 17 00:00:00 2001 From: John Kingsnorth Date: Mon, 7 Feb 2022 11:49:00 +0000 Subject: [PATCH] Fix regression with flexible merging of contact information --- CRM/Dedupe/Merger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 152273f992..5c4df7f318 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -2750,6 +2750,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m // Add this value to the table rows $rows["move_location_{$blockName}_{$count}"]['other'] = $displayValue; + $rows["move_location_{$blockName}_{$count}"]['location_entity'] = $blockName; // CRM-17556 Only display 'main' contact value if it's the same location + type // Look it up from main values... @@ -2777,7 +2778,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m // Set this value as the default against the 'other' contact value $rows["move_location_{$blockName}_{$count}"]['main'] = $mainValueCheck[$blockInfo['displayField']]; $rows["move_location_{$blockName}_{$count}"]['main_is_primary'] = $mainValueCheck['is_primary'] ?? 0; - $rows["move_location_{$blockName}_{$count}"]['location_entity'] = $blockName; $mainContactBlockId = $mainValueCheck['id']; break; } -- 2.25.1