Merge pull request #13978 from totten/master-phpcbf

[civicrm-core.git] / CRM / Dedupe / Merger.php

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 5d9921bcb1e4a4c13fd849dfa3afa472594dd695..3cab5581bbd1b5a8941d19c8ebbfa838d7aea72d 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -472,7 +472,8 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
               "return" => "id",
             ]
           )
-        ));
+        )
+      );
 
       if (!empty($membershipIDs)) {
         civicrm_api3("Membership", "get", [
@@ -1326,6 +1327,7 @@ 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'];
+                $rows["move_location_{$blockName}_{$count}"]['location_entity'] = $blockName;
                 $mainContactBlockId = $mainValueCheck['id'];
                 break;
               }