From c4b395d5b668d75ffa5e1badf7a018c74e9e9092 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 21 Dec 2021 09:04:39 +1300
Subject: [PATCH] Cleanup Smarty e-notices on campaign dashboard

---
 CRM/Campaign/Page/DashBoard.php           | 7 ++++++-
 templates/CRM/Campaign/Page/DashBoard.tpl | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CRM/Campaign/Page/DashBoard.php b/CRM/Campaign/Page/DashBoard.php
index c0908cccf5..2bb95279c8 100644
--- a/CRM/Campaign/Page/DashBoard.php
+++ b/CRM/Campaign/Page/DashBoard.php
@@ -448,12 +448,12 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
       }
       //load the data in tabs.
       $this->{'browse' . ucfirst($subPageType)}();
-      $this->assign('subPageType', ucfirst($subPageType));
     }
     // Initialize tabs
     else {
       $this->buildTabs();
     }
+    $this->assign('subPageType', ucfirst($subPageType));
   }
 
   /**
@@ -477,6 +477,11 @@ class CRM_Campaign_Page_DashBoard extends CRM_Core_Page {
         'valid' => TRUE,
         'active' => TRUE,
         'link' => CRM_Utils_System::url('civicrm/campaign', "reset=1&type=$name"),
+        'extra' => NULL,
+        'template' => NULL,
+        'count' => NULL,
+        'icon' => NULL,
+        'class' => NULL,
       ];
     }
     $allTabs['campaign']['class'] = 'livePage';
diff --git a/templates/CRM/Campaign/Page/DashBoard.tpl b/templates/CRM/Campaign/Page/DashBoard.tpl
index e00b52de69..18d26d1e83 100644
--- a/templates/CRM/Campaign/Page/DashBoard.tpl
+++ b/templates/CRM/Campaign/Page/DashBoard.tpl
@@ -10,7 +10,7 @@
 {* CiviCampaign DashBoard (launch page) *}
 
 
-{if !empty($subPageType)}
+{if $subPageType}
   {* load campaign/survey/petition tab *}
   {include file="CRM/Campaign/Form/Search/$subPageType.tpl"}
 {else}
-- 
2.25.1