From bae8bc6f05fffc99765533f5c272d496e73e688a Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 15 Sep 2023 14:26:39 +1200
Subject: [PATCH] Fix all instances of call Profile template to specify the
 prefix

---
 templates/CRM/Campaign/Form/Petition/Signature.tpl            | 4 ++--
 templates/CRM/Contribute/Form/Contribution/Confirm.tpl        | 4 ++--
 templates/CRM/Contribute/Form/Contribution/Main.tpl           | 4 ++--
 templates/CRM/Contribute/Form/Contribution/ThankYou.tpl       | 4 ++--
 templates/CRM/Contribute/Form/PCP/PCPAccount.tpl              | 2 +-
 .../CRM/Event/Form/Registration/AdditionalParticipant.tpl     | 4 ++--
 templates/CRM/Event/Form/Registration/Register.tpl            | 4 ++--
 templates/CRM/PCP/Form/PCPAccount.tpl                         | 2 +-
 templates/CRM/UF/Form/Fields.tpl                              | 4 ++--
 templates/CRM/UF/Form/Preview.tpl                             | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/templates/CRM/Campaign/Form/Petition/Signature.tpl b/templates/CRM/Campaign/Form/Petition/Signature.tpl
index 57ac1e6b14..8433b4c192 100644
--- a/templates/CRM/Campaign/Form/Petition/Signature.tpl
+++ b/templates/CRM/Campaign/Form/Petition/Signature.tpl
@@ -42,11 +42,11 @@
     {/if}
   {else}
     <div class="crm-section crm-petition-contact-profile">
-      {include file="CRM/UF/Form/Block.tpl" fields=$petitionContactProfile hideFieldset=true}
+      {include file="CRM/UF/Form/Block.tpl" fields=$petitionContactProfile hideFieldset=true prefix=false}
     </div>
 
     <div class="crm-section crm-petition-activity-profile">
-      {include file="CRM/UF/Form/Block.tpl" fields=$petitionActivityProfile hideFieldset=true}
+      {include file="CRM/UF/Form/Block.tpl" fields=$petitionActivityProfile hideFieldset=true prefix=false}
     </div>
 
     <div class="crm-submit-buttons">
diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index d0de9b5044..54c0e86d35 100644
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -173,7 +173,7 @@
 
   {if $customPre}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
     </fieldset>
   {/if}
 
@@ -272,7 +272,7 @@
 
   {if $customPost}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
     </fieldset>
   {/if}
 
diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index 44f138379f..48db04009e 100644
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -214,7 +214,7 @@
       {/if}
 
       <div class="crm-public-form-item crm-group custom_pre_profile-group">
-        {include file="CRM/UF/Form/Block.tpl" fields=$customPre}
+        {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
       </div>
 
       {if array_key_exists('pcp_display_in_roll', $form)}
@@ -283,7 +283,7 @@
     {include file="CRM/Core/BillingBlockWrapper.tpl"}
 
     <div class="crm-public-form-item crm-group custom_post_profile-group">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
     </div>
 
     <div id="crm-submit-buttons" class="crm-submit-buttons">
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 22ba1af23e..3512855d5e 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -220,7 +220,7 @@
 
   {if $customPre}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
     </fieldset>
   {/if}
 
@@ -304,7 +304,7 @@
 
   {if $customPost}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
     </fieldset>
   {/if}
 
diff --git a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
index c00a5a25f2..a9c6613524 100644
--- a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
+++ b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
@@ -22,7 +22,7 @@
 {else}
 <div class="form-item">
 {include file="CRM/common/CMSUser.tpl"}
-{include file="CRM/UF/Form/Block.tpl" fields=$fields}
+{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false}
 </div>
 <div class="crm-submit-buttons">
 {include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index 43b45f141d..afa1cc2568 100644
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -22,7 +22,7 @@
 {/if}
 
 <div class="crm-public-form-item crm-section custom_pre-section">
-  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre}
+  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre prefix=false}
 </div>
 
 {if $priceSet && $allowGroupOnWaitlist}
@@ -49,7 +49,7 @@
 {/if}
 
 <div class="crm-public-form-item crm-section custom_post-section">
-  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost}
+  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost prefix=false}
 </div>
 
 <div id="crm-submit-buttons" class="crm-submit-buttons">
diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl
index c26e284a80..0ed07dc0c9 100644
--- a/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/templates/CRM/Event/Form/Registration/Register.tpl
@@ -73,7 +73,7 @@
 
     <div class="crm-public-form-item crm-section custom_pre-section">
       {* Display "Top of page" profile immediately after the introductory text *}
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
     </div>
 
     {if $priceSet}
@@ -135,7 +135,7 @@
     {/if}
 
     <div class="crm-public-form-item crm-section custom_post-section">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
     </div>
 
     <div id="crm-submit-buttons" class="crm-submit-buttons">
diff --git a/templates/CRM/PCP/Form/PCPAccount.tpl b/templates/CRM/PCP/Form/PCPAccount.tpl
index d9821f5a16..645cb781cf 100644
--- a/templates/CRM/PCP/Form/PCPAccount.tpl
+++ b/templates/CRM/PCP/Form/PCPAccount.tpl
@@ -26,7 +26,7 @@
 {else}
 <div class="form-item crm-block crm-form-block">
 {include file="CRM/common/CMSUser.tpl"}
-{include file="CRM/UF/Form/Block.tpl" fields=$fields}
+{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false}
 
 <div class="crm-submit-buttons">
 {include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl
index 40064f5216..05a85e6700 100644
--- a/templates/CRM/UF/Form/Fields.tpl
+++ b/templates/CRM/UF/Form/Fields.tpl
@@ -15,7 +15,7 @@
   {if $field.groupTitle != $fieldset}
     {if $fieldset != $zeroField}
       {if $groupHelpPost && $action neq 4}
-        <div class="messages help">{$groupHelpPost}</div>
+        <div class="messages help">{$groupHelpPost|smarty:nodefaults|purify}</div>
       {/if}
       {if $mode ne 8}
         </fieldset>
@@ -32,7 +32,7 @@
     {assign var=fieldset  value=`$field.groupTitle`}
     {assign var=groupHelpPost  value=`$field.groupHelpPost`}
     {if $field.groupHelpPre && $action neq 4}
-      <div class="messages help">{$field.groupHelpPre}</div>
+      <div class="messages help">{$field.groupHelpPre|smarty:nodefaults|purify}</div>
     {/if}
   {/if}
 
diff --git a/templates/CRM/UF/Form/Preview.tpl b/templates/CRM/UF/Form/Preview.tpl
index be3c55603e..3d78c9a733 100644
--- a/templates/CRM/UF/Form/Preview.tpl
+++ b/templates/CRM/UF/Form/Preview.tpl
@@ -24,7 +24,7 @@
         {if $help_pre && $action neq 4}<div class="messages help">{$help_pre}</div>{/if}
         {assign var=zeroField value="Initial Non Existent Fieldset"}
         {assign var=fieldset  value=$zeroField}
-        {include file="CRM/UF/Form/Fields.tpl"}
+        {include file="CRM/UF/Form/Fields.tpl" prefix=false mode=false hideFieldset=false}
         {if $field.groupHelpPost}
           <div class="messages help">{$field.groupHelpPost}</div>
         {/if}
-- 
2.25.1