From 4f2ad1d1d7ad2eebeb0f933974afcf2224c5ac82 Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Tue, 24 Nov 2015 13:38:21 +0000 Subject: [PATCH] Fix updating location 'type' during merge --- CRM/Dedupe/Merger.php | 2 +- templates/CRM/Contact/Form/Merge.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index f4ae9d851d..23c1462422 100644 --- 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 8d80f21968..8ad08730a2 100644 --- 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 *} -- 2.25.1