From be7196c490690a1bbd53d7accf6a7251df4e49bd Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 13 Apr 2020 15:42:55 +0100
Subject: [PATCH] Fix 'selectedChild' parameter for pages with tabs

---
 templates/CRM/Admin/Page/Extensions.tpl       | 2 +-
 templates/CRM/Admin/Page/MessageTemplates.tpl | 2 +-
 templates/CRM/Event/Form/ManageEvent/Tab.tpl  | 1 -
 templates/CRM/UF/Page/Group.tpl               | 2 +-
 templates/CRM/common/TabHeader.tpl            | 1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl
index ae0f4aca98..219b3681ab 100644
--- a/templates/CRM/Admin/Page/Extensions.tpl
+++ b/templates/CRM/Admin/Page/Extensions.tpl
@@ -85,7 +85,7 @@
     </script>
     {/literal}
 
-    {include file="CRM/common/TabSelected.tpl" defaultTab="summary"}
+    {include file="CRM/common/TabHeader.tpl" defaultTab="summary"}
 
     {* Refresh buttons *}
     {literal}
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index 6e96547706..2d704fdd96 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -157,7 +157,7 @@
     {/foreach}
   </div>
 </div>
-{include file="CRM/common/TabSelected.tpl" defaultTab="user"}
+{include file="CRM/common/TabHeader.tpl"}
 
 {elseif $action ne 1 and $action ne 2 and $action ne 4 and $action ne 8}
   <div class="messages status no-popup">
diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index b27b068877..bbaf1a0fc6 100644
--- a/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -91,4 +91,3 @@ CRM.$(function($) {
 </script>
 {/literal}
 {include file="CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl" entityID=$id entityTable="civicrm_event"}
-{include file="CRM/common/TabSelected.tpl" defaultTab="settings"}
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index 112a480043..62469563a9 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -142,7 +142,7 @@
         </div>{* reserved profile*}
 
   </div>
-{include file="CRM/common/TabSelected.tpl" defaultTab="user-profiles"}
+{include file="CRM/common/TabHeader.tpl"}
 
     {else}
     {if $action ne 1} {* When we are adding an item, we should not display this message *}
diff --git a/templates/CRM/common/TabHeader.tpl b/templates/CRM/common/TabHeader.tpl
index 1345f31f9a..a10aa28ffa 100644
--- a/templates/CRM/common/TabHeader.tpl
+++ b/templates/CRM/common/TabHeader.tpl
@@ -37,3 +37,4 @@
   {/if}
   <div class="clear"></div>
 </div> {* crm-content-block ends here *}
+{include file="CRM/common/TabSelected.tpl" defaultTab="settings"}
-- 
2.25.1