Remove use of isset for info.tpl

civicrm · Nov 10, 2021 · 25f044f · 25f044f
1 parent ae9e89a
commit 25f044f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -263,6 +263,13 @@ public function setContext() {
    */
   public $expectedSmartyVariables = [
     'beginHookFormElements',
+    // required for footer.tpl
+    'contactId',
+    // required for info.tpl
+    'infoMessage',
+    'infoTitle',
+    'infoType',
+    'infoOptions',
   ];
 
   /**

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
@@ -113,6 +113,11 @@ class CRM_Core_Page {
     'hookContentPlacement',
     // required for footer.tpl
     'contactId',
+    // required for info.tpl
+    'infoMessage',
+    'infoTitle',
+    'infoType',
+    'infoOptions',
   ];
 
   /**

diff --git a/templates/CRM/common/info.tpl b/templates/CRM/common/info.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 {* Handles display of passed $infoMessage. *}
-{if isset($infoMessage) or isset($infoTitle)}
-  <div class="messages status {$infoType|default:''}"{if !empty($infoOptions)} data-options='{$infoOptions}'{/if}>
+{if $infoMessage || $infoTitle}
+  <div class="messages status {$infoType}"{if $infoOptions} data-options='{$infoOptions}'{/if}>
     {icon icon="fa-info-circle"}{/icon}
-    <span class="msg-title">{$infoTitle|default:''}</span>
-    <span class="msg-text">{$infoMessage|default:''}</span>
+    <span class="msg-title">{$infoTitle}</span>
+    <span class="msg-text">{$infoMessage}</span>
   </div>
 {/if}