From 26d3ede641dae0805d799fec5000708ea19e2bc0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 29 Jul 2019 14:00:49 +1200
Subject: [PATCH] dev/core#1042 fix  duplicate activities on custom data block

---
 templates/CRM/Activity/Form/Activity.tpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 9069edfc88..e43909aa4d 100644
--- 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*}
 
-- 
2.25.1