From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 11 Jun 2021 03:49:42 +0000 (+1200)
Subject: Fix a few more undefined template vars
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ceccc741924abcd2a5855af0a7764f1434d5531d;p=civicrm-core.git

Fix a few more undefined template vars
---

diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php
index bbd3b427f8..1d7a605a29 100644
--- a/CRM/Core/Block.php
+++ b/CRM/Core/Block.php
@@ -440,6 +440,7 @@ class CRM_Core_Block {
     }
     $value['title'] = $short['title'];
     $value['ref'] = $short['ref'] ?? '';
+    $value['shortCuts'] = [];
     if (!empty($short['shortCuts'])) {
       foreach ($short['shortCuts'] as $shortCut) {
         $value['shortCuts'][] = self::setShortcutValues($shortCut);
diff --git a/templates/CRM/common/debug.tpl b/templates/CRM/common/debug.tpl
index 29dc8d016b..9000418de9 100644
--- a/templates/CRM/common/debug.tpl
+++ b/templates/CRM/common/debug.tpl
@@ -8,26 +8,26 @@
  +--------------------------------------------------------------------+
 *}
 <!-- .tpl file invoked: {$tplFile}. Call via form.tpl if we have a form in the page. -->
-{if $smarty.get.smartyDebug}
+{if !empty($smarty.get.smartyDebug)}
 {debug}
 {/if}
 
-{if $smarty.get.sessionReset}
+{if !empty($smarty.get.sessionReset)}
 {$session->reset($smarty.get.sessionReset)}
 {/if}
 
-{if $smarty.get.sessionDebug}
+{if !empty($smarty.get.sessionDebug)}
 {$session->debug($smarty.get.sessionDebug)}
 {/if}
 
-{if $smarty.get.directoryCleanup}
+{if !empty($smarty.get.directoryCleanup)}
 {$config->cleanup($smarty.get.directoryCleanup)}
 {/if}
 
-{if $smarty.get.cacheCleanup}
+{if !empty($smarty.get.cacheCleanup)}
 {$config->clearDBCache()}
 {/if}
 
-{if $smarty.get.configReset}
+{if !empty($smarty.get.configReset)}
 {$config->reset()}
 {/if}