CRM-16949 - Multi-record custom fields repeated when displayed for an individual

diff --git a/templates/CRM/Contact/Page/View/CustomData.tpl b/templates/CRM/Contact/Page/View/CustomData.tpl
index 6cd6b78bb5f516742660a2f9e34715ed8d6e3b05..71d69300f0c4fb9b94ebfb5248d06b1c6db8ac96 100644 (file)
--- a/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -25,6 +25,13 @@
 *}
 {* template for custom data *}
 {assign var="customDataGroupName" value=$customDataGroup.name}
+{strip}
+  {if $displayStyle neq 'tableOriented' and $action eq 16 or $action eq 4} {* Browse or View actions *}
+    <div class="form-item">
+      {include file="CRM/Custom/Page/CustomDataView.tpl"}
+    </div>
+  {/if}
+{/strip}
 {foreach from=$viewCustomData item=customGroupWrapper}
   {foreach from=$customGroupWrapper item=customGroup key=customGroupId}
     {assign var="customRegion" value='contact-custom-data-'|cat:$customGroup.name}
@@ -59,14 +66,6 @@
           </script>
         {/literal}
       {else}
-        {strip}
-          {if $action eq 16 or $action eq 4} {* Browse or View actions *}
-            <div class="form-item">
-              {include file="CRM/Custom/Page/CustomDataView.tpl"}
-            </div>
-          {/if}
-        {/strip}
-
         {if $mainEditForm}
           <script type="text/javascript">
             var showBlocks1 = new Array({$showBlocks1});