Fix updating location 'type' during merge

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index f4ae9d851d92260f09aa04d199b48e1ebbf97945..23c146242208781bbac4484445e7a5d8daf258dc 100644 (file)
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1294,7 +1294,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
             // Add the element
             $elements[] = array(
               'select',
-              "type[$blockName][$count][typeTypeId]",
+              "location[$blockName][$count][typeTypeId]",
               NULL,
               $defaultTypeId + $tmpIdList,
               $js,

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 8d80f2196842a501ab0e1a4fc7a70741d99505a6..8ad08730a2317e67fff4aa80b1e7979b500e8152 100644 (file)
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -125,7 +125,7 @@
 
             {* Display other_type_id for websites, ims and phones *}
             {if $blockName eq 'website' || $blockName eq 'im' || $blockName eq 'phone' }
-              {$form.type.$blockName.$blockId.typeTypeId.html} 
+              {$form.location.$blockName.$blockId.typeTypeId.html} 
             {/if}
 
             {* Display the overwrite/add/add new label *}