Merge pull request #14936 from totten/5.15-act-custom

(dev/core#1042) Activities - Fix duplicate custom data block
civicrm · Jul 31, 2019 · 2823cec · 2823cec
2 parents 230f015 + 2c1d250
commit 2823cec
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
@@ -189,9 +189,10 @@
   <tr class="crm-activity-form-block-custom_data">
     <td colspan="2">
       {if $action eq 4}
-      {include file="CRM/Custom/Page/CustomDataView.tpl"}
-        {else}
+        {include file="CRM/Custom/Page/CustomDataView.tpl"}
+      {else}
         <div id="customData"></div>
+        {include file="CRM/common/customDataBlock.tpl"}
       {/if}
     </td>
   </tr>
@@ -293,8 +294,6 @@
       });
     </script>
     {/literal}
-
-    {include file="CRM/common/customDataBlock.tpl"}
   {/if}
   </div>{* end of form block*}