Cleanup Smarty e-notices on campaign dashboard

diff --git a/CRM/Campaign/Page/DashBoard.php b/CRM/Campaign/Page/DashBoard.php
index c0908cccf59f71ee857aa9bfb5cbb0bc44e89e49..2bb95279c8f20c6865d81d26b86ea77af43f2652 100644 (file)
--- 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 e00b52de69c8387697c618c24faa37a072f33479..18d26d1e83d7bf6506acd12edeea5b70c9ae8e6d 100644 (file)
--- 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}