Merge pull request #26599 from eileenmcnaughton/offline_madness

Fix e-notices in contribution_offline_receipt text by removing always-empty field
civicrm · Jun 22, 2023 · 30ab23d · 30ab23d
2 parents f913090 + a4c536b
commit 30ab23d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
@@ -21,11 +21,7 @@
   <tr>
    <td>
     {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    {if !empty($formValues.receipt_text)}
-     <p>{$formValues.receipt_text|htmlize}</p>
-    {else}
      <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>
-    {/if}
    </td>
   </tr>
   <tr>

diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
@@ -1,8 +1,6 @@
 {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
 
-{if !empty($formValues.receipt_text)}
-{$formValues.receipt_text}
-{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}
+{ts}Below you will find a receipt for this contribution.{/ts}
 
 ===========================================================
 {ts}Contribution Information{/ts}