Merge pull request #22892 from braders/ensure-tabheader-keys-are-assi…

…gned Avoid e-notices on pages with tabs
civicrm · Mar 6, 2022 · 0868278 · 0868278
2 parents bde31ce + 42aa581
commit 0868278
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -719,7 +719,7 @@ public function buildForm() {
     // our ensured variables get blown away, so we need to set them even if
     // it's already been initialized.
     self::$_template->ensureVariablesAreAssigned($this->expectedSmartyVariables);
-
+    self::$_template->addExpectedTabHeaderKeys();
   }
 
   /**

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
@@ -199,6 +199,8 @@ public function run() {
     $pageTemplateFile = $this->getHookedTemplateFileName();
     self::$_template->assign('tplFile', $pageTemplateFile);
 
+    self::$_template->addExpectedTabHeaderKeys();
+
     // invoke the pagRun hook, CRM-3906
     CRM_Utils_Hook::pageRun($this);
 

diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
@@ -202,6 +202,26 @@ public function ensureVariablesAreAssigned(array $variables): void {
     }
   }
 
+  /**
+   * Avoid e-notices on pages with tabs,
+   * by ensuring tabHeader items contain the necessary keys
+   */
+  public function addExpectedTabHeaderKeys(): void {
+    $defaults = [
+      'class' => '',
+      'extra' => '',
+      'icon' => FALSE,
+      'count' => FALSE,
+      'template' => FALSE,
+    ];
+
+    $tabs = $this->get_template_vars('tabHeader');
+    foreach ((array) $tabs as $i => $tab) {
+      $tabs[$i] = array_merge($defaults, $tab);
+    }
+    $this->assign('tabHeader', $tabs);
+  }
+
   /**
    * Fetch a template (while using certain variables)
    *