Do not escape error message

diff --git a/templates/CRM/common/info.tpl b/templates/CRM/common/info.tpl
index 1584b0002ef05df0a9a2f0a89d9741cb777fcef9..1435bc370291694e1789eeb01120295b4ac1c081 100644 (file)
--- 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 5ff662baf0dc3ad79b353b77d40f1132f78ba92d..098055e539ba73c4860f8644e6c87f8298a0a443 100644 (file)
--- 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}