From ebff48ff909aa00f87b5613bd209037d8a1ba3de Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 7 Jul 2022 20:57:05 +1200
Subject: [PATCH] Do not escape error message

---
 templates/CRM/common/info.tpl   | 6 +++---
 templates/CRM/common/status.tpl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/common/info.tpl b/templates/CRM/common/info.tpl
index 1584b0002ef0..1435bc370291 100644
--- a/templates/CRM/common/info.tpl
+++ b/templates/CRM/common/info.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 {* Handles display of passed $infoMessage. *}
-{if $infoMessage || $infoTitle}
-  <div class="messages status {$infoType}"{if $infoOptions} data-options='{$infoOptions}'{/if}>
+{if $infoMessage|smarty:nodefaults || $infoTitle|smarty:nodefaults}
+  <div class="messages status {$infoType}"{if $infoOptions} data-options='{$infoOptions|smarty:nodefaults}'{/if}>
     {icon icon="fa-info-circle"}{/icon}
     <span class="msg-title">{$infoTitle}</span>
-    <span class="msg-text">{$infoMessage}</span>
+    <span class="msg-text">{$infoMessage|smarty:nodefaults}</span>
   </div>
 {/if}
diff --git a/templates/CRM/common/status.tpl b/templates/CRM/common/status.tpl
index 5ff662baf0dc..098055e539ba 100644
--- a/templates/CRM/common/status.tpl
+++ b/templates/CRM/common/status.tpl
@@ -17,6 +17,6 @@
     {else}
       {assign var="infoType" value=$statItem.type}
     {/if}
-    {include file="CRM/common/info.tpl" infoTitle=$statItem.title infoMessage=$statItem.text infoOptions=$statItem.options|@json_encode}
+    {include file="CRM/common/info.tpl" infoTitle=$statItem.title|smarty:nodefaults infoMessage=$statItem.text|smarty:nodefaults infoOptions=$statItem.options|smarty:nodefaults|@json_encode}
   {/foreach}
 {/if}