From b0d4639d799fb3fbebc6cc73c27f57d5b5a0ca1d Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 21 Mar 2022 10:29:28 +1300
Subject: [PATCH] Do not escape hierarchical select

We already have 'cutouts' in the escape function to not escape assigned html.
It isn't catching the hierarchical select elements - so I have marked a bunch
to not be escaped. I could have handled in 'escape' but I think tpl handling
is actually correct - the cutouts in the escape function was to get it to
a more manageable level
---
 templates/CRM/Activity/Import/Form/MapTable.tpl   | 2 +-
 templates/CRM/Contact/Import/Form/MapTable.tpl    | 2 +-
 templates/CRM/Contact/Import/Form/Mapper.tpl      | 2 +-
 templates/CRM/Contribute/Import/Form/MapTable.tpl | 2 +-
 templates/CRM/Custom/Form/Group.tpl               | 2 +-
 templates/CRM/Event/Import/Form/MapTable.tpl      | 2 +-
 templates/CRM/Member/Import/Form/MapTable.tpl     | 2 +-
 templates/CRM/UF/Form/Field.tpl                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/CRM/Activity/Import/Form/MapTable.tpl b/templates/CRM/Activity/Import/Form/MapTable.tpl
index 6ecd9c181db0..97f3b7a2f37d 100644
--- a/templates/CRM/Activity/Import/Form/MapTable.tpl
+++ b/templates/CRM/Activity/Import/Form/MapTable.tpl
@@ -48,7 +48,7 @@
                     {if $wizard.currentStepName == 'Preview'}
                         {$mapper[$i]}
                     {else}
-                        {$form.mapper[$i].html}
+                        {$form.mapper[$i].html|smarty:nodefaults}
                     {/if}
                 </td>
 
diff --git a/templates/CRM/Contact/Import/Form/MapTable.tpl b/templates/CRM/Contact/Import/Form/MapTable.tpl
index 6eb7c6534611..20162b4cbc87 100644
--- a/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -98,7 +98,7 @@
                             {*/if*}
                         {/if}
                     {else}
-                        {$form.mapper[$i].html}
+                        {$form.mapper[$i].html|smarty:nodefaults}
                     {/if}
                 </td>
 
diff --git a/templates/CRM/Contact/Import/Form/Mapper.tpl b/templates/CRM/Contact/Import/Form/Mapper.tpl
index cc726d449618..d2fa2f052476 100644
--- a/templates/CRM/Contact/Import/Form/Mapper.tpl
+++ b/templates/CRM/Contact/Import/Form/Mapper.tpl
@@ -15,7 +15,7 @@
    <dl>
      {section name=count start=1 loop=`$maxMapper`}
      {assign var='i' value=$smarty.section.count.index}
-       <dt>{$form.mapper[$i].label}</dt><dd>{$form.mapper[$i].html}<span class="tundra" id="id_map_mapper[{$i}]_1"><span id="id_mapper[{$i}]_1"></span></span><span class="tundra" id="id_map_mapper[{$i}]_2"><span id="id_mapper[{$i}]_2"></span></span><span class="tundra" id="id_map_mapper[{$i}]_3"><span id="id_mapper[{$i}]_3"></span></span></dd>
+       <dt>{$form.mapper[$i].label}</dt><dd>{$form.mapper[$i].html|smarty:nodefaults}<span class="tundra" id="id_map_mapper[{$i}]_1"><span id="id_mapper[{$i}]_1"></span></span><span class="tundra" id="id_map_mapper[{$i}]_2"><span id="id_mapper[{$i}]_2"></span></span><span class="tundra" id="id_map_mapper[{$i}]_3"><span id="id_mapper[{$i}]_3"></span></span></dd>
 
        {literal}
         <script type="text/javascript">
diff --git a/templates/CRM/Contribute/Import/Form/MapTable.tpl b/templates/CRM/Contribute/Import/Form/MapTable.tpl
index 4c6909d271af..4490a735b253 100644
--- a/templates/CRM/Contribute/Import/Form/MapTable.tpl
+++ b/templates/CRM/Contribute/Import/Form/MapTable.tpl
@@ -50,7 +50,7 @@
           {$mapper[$i]}
       {/if}
                     {else}
-                        {$form.mapper[$i].html}
+                        {$form.mapper[$i].html|smarty:nodefaults}
                     {/if}
                 </td>
 
diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index e03c9e299ec8..2e7161cb1453 100644
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -18,7 +18,7 @@
     </tr>
     <tr>
         <td class="label">{$form.extends.label}</td>
-        <td>{$form.extends.html} {help id="id-extends"}</td>
+        <td>{$form.extends.html|smarty:nodefaults} {help id="id-extends"}</td>
     </tr>
     <tr>
         <td class="label">{$form.weight.label}</td>
diff --git a/templates/CRM/Event/Import/Form/MapTable.tpl b/templates/CRM/Event/Import/Form/MapTable.tpl
index 00d7072721c9..204fc97c65f6 100644
--- a/templates/CRM/Event/Import/Form/MapTable.tpl
+++ b/templates/CRM/Event/Import/Form/MapTable.tpl
@@ -46,7 +46,7 @@
                     {if $wizard.currentStepName == 'Preview'}
                         {$mapper[$i]}
                     {else}
-                        {$form.mapper[$i].html}
+                        {$form.mapper[$i].html|smarty:nodefaults}
                     {/if}
                 </td>
 
diff --git a/templates/CRM/Member/Import/Form/MapTable.tpl b/templates/CRM/Member/Import/Form/MapTable.tpl
index 0a3dfec5ae28..d64ac9f23b1e 100644
--- a/templates/CRM/Member/Import/Form/MapTable.tpl
+++ b/templates/CRM/Member/Import/Form/MapTable.tpl
@@ -46,7 +46,7 @@
                     {if $wizard.currentStepName == 'Preview'}
                         {$mapper[$i]}
                     {else}
-                        {$form.mapper[$i].html}
+                        {$form.mapper[$i].html|smarty:nodefaults}
                     {/if}
                 </td>
 
diff --git a/templates/CRM/UF/Form/Field.tpl b/templates/CRM/UF/Form/Field.tpl
index 83a5056f7a06..8fe08d44516f 100644
--- a/templates/CRM/UF/Form/Field.tpl
+++ b/templates/CRM/UF/Form/Field.tpl
@@ -18,7 +18,7 @@
   <table class="form-layout-compressed">
     <tr class="crm-uf-field-form-block-field_name">
       <td class="label">{$form.field_name.label} {help id='field_name_0'}</td>
-      <td>{$form.field_name.html}<br />
+      <td>{$form.field_name.html|smarty:nodefaults}<br />
         <span class="description">&nbsp;{ts}Select the type of CiviCRM record and the field you want to include in this Profile.{/ts}</span></td>
     </tr>
     <tr class="crm-uf-field-form-block-label">