From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 17 Nov 2015 10:52:07 +0000 (+0000)
Subject: Fix overwrite/add label for addresses
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8445be5a29da1a3b7a30c2e4433accd3889cfb1d;p=civicrm-core.git

Fix overwrite/add label for addresses
---

diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index bd88d7f1d2..6f682af69f 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -127,7 +127,7 @@
               {$form.type.$blockName.$blockId.typeTypeId.html}&nbsp;
             {/if}
 
-            {if $blockName eq 'email' || $blockName eq 'phone' || $blockName eq 'website' || $blockName eq 'im' }
+            {if $blockName eq 'address' || $blockName eq 'email' || $blockName eq 'phone' || $blockName eq 'website' || $blockName eq 'im' }
               <span id="main_{$blockName}_{$blockId}_overwrite">
                 {if $row.main}
                   (overwrite){$form.location.$blockName.$blockId.html}&nbsp;<br />