From a94c85305efb4817560eed5266a8298222a66aa0 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 30 Jan 2023 12:29:22 +1300
Subject: [PATCH] Fix some more smarty assignments to assign even when FALSE

---
 CRM/Contribute/Form/Contribution.php           | 13 +++----------
 templates/CRM/Contribute/Form/Contribution.tpl |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index daac2892e9..c3ad2b33dd 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -397,10 +397,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     if (empty($defaults['payment_instrument_id'])) {
       $defaults['payment_instrument_id'] = $this->getDefaultPaymentInstrumentId();
     }
-
-    if (!empty($defaults['is_test'])) {
-      $this->assign('is_test', TRUE);
-    }
+    $this->assign('is_test', !empty($defaults['is_test']));
 
     $this->assign('showOption', TRUE);
     // For Premium section.
@@ -422,13 +419,9 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
       }
     }
 
-    if (isset($this->userEmail)) {
-      $this->assign('email', $this->userEmail);
-    }
+    $this->assign('email', $this->userEmail);
+    $this->assign('is_pay_later', !empty($defaults['is_pay_later']));
 
-    if (!empty($defaults['is_pay_later'])) {
-      $this->assign('is_pay_later', TRUE);
-    }
     $this->assign('contribution_status_id', CRM_Utils_Array::value('contribution_status_id', $defaults));
     if (!empty($defaults['contribution_status_id']) && in_array(
         CRM_Contribute_PseudoConstant::contributionStatus($defaults['contribution_status_id'], 'name'),
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 87157abdfb..1549c4f315 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -66,7 +66,7 @@
         </tr>
         <tr class="crm-contribution-form-block-contribution_type_id crm-contribution-form-block-financial_type_id">
           <td class="label">{$form.financial_type_id.label}</td><td{$valueStyle}>{$form.financial_type_id.html}&nbsp;
-            {if !empty($is_test)}
+            {if $is_test}
               {ts}(test){/ts}
             {/if} {help id="id-financial_type"}
           </td>
-- 
2.25.1