From 3b8dfec6fa2de2ce70fa9901946e783f2deb24c4 Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 4 Jan 2016 15:06:36 +0000
Subject: [PATCH] CRM-17261: Remove broken IDs from non-location elements

---
 templates/CRM/Contact/Form/Merge.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 34f33d67b0..c5d6f2b7d3 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -108,18 +108,18 @@ You will need to manually delete that user (click on the link to open the %1 use
         </td>
       {/if}
 
+        {assign var=position  value=$field|strrpos:'_'}
+        {assign var=blockId   value=$field|substr:$position+1}
+        {assign var=blockName value=$field|substr:14:$position-14}
+
         <td>
-          {if $row.title|substr:0:7 == "Address"}<span id="other_{$blockName}_{$blockId}" style="white-space:pre">{else}<span id="other_{$blockName}_{$blockId}">{/if}{if !is_array($row.other)}{$row.other}{elseif $row.other.fileName}{$row.other.fileName}{else}{', '|implode:$row.other}{/if}</span>
+          {if $row.title|substr:0:7 == "Address"}<span style="white-space:pre">{else}<span>{/if}{if !is_array($row.other)}{$row.other}{elseif $row.other.fileName}{$row.other.fileName}{else}{', '|implode:$row.other}{/if}</span>
         </td>
 
         <td style='white-space: nowrap'>
            {if $form.$field}=={$form.$field.html|crmAddClass:"select-row"}==&gt;{/if}
         </td>
 
-        {assign var=position  value=$field|strrpos:'_'}
-        {assign var=blockId   value=$field|substr:$position+1}
-        {assign var=blockName value=$field|substr:14:$position-14}
-
         {* For location blocks *}
         {if $row.title|substr:0:5 == "Email"   OR
             $row.title|substr:0:7 == "Address" OR
@@ -160,7 +160,7 @@ You will need to manually delete that user (click on the link to open the %1 use
         {else}
 
           <td>
-            <span id="main_{$blockName}_{$blockId}">
+            <span>
               {if !is_array($row.main)}
                 {$row.main}
               {elseif $row.main.fileName}
@@ -173,7 +173,7 @@ You will need to manually delete that user (click on the link to open the %1 use
 
           <td>
             {if isset($row.main) || isset($row.other)}
-              <span id="main_{$blockName}_{$blockId}_overwrite">
+              <span>
                 {if $row.main == $row.other}
                   <span class="action_label">({ts}match{/ts})</span><br />
                 {elseif $row.main}
-- 
2.25.1