From 25f044f6edec7ca55c5bc5a71cb3eab673417913 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 11 Nov 2021 08:57:46 +1300
Subject: [PATCH] Remove use of isset for info.tpl

---
 CRM/Core/Form.php             | 7 +++++++
 CRM/Core/Page.php             | 5 +++++
 templates/CRM/common/info.tpl | 8 ++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 9aff42aa6c..bd23babf00 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -263,6 +263,13 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
    */
   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
index 6150a5a2af..7404125fc8 100644
--- 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
index 410e20aebb..1584b0002e 100644
--- 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}
-- 
2.25.1