From badd5cbcd4f019cd5fd4d12b966f3debc638d72b Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 30 Nov 2023 00:17:48 +1300
Subject: [PATCH] Add notice fix for Confirm & thank you pages

---
 CRM/Contribute/Form/Contribution/ThankYou.php                 | 4 ++--
 .../CRM/Contribute/Form/Contribution/MembershipBlock.tpl      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/ThankYou.php b/CRM/Contribute/Form/Contribution/ThankYou.php
index 65490ef892..5899efa1a3 100644
--- a/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -104,10 +104,10 @@ class CRM_Contribute_Form_Contribution_ThankYou extends CRM_Contribute_Form_Cont
       if (is_array($membershipTypeID)) {
         $membershipTypeID = current($membershipTypeID);
       }
-      $this->assign('is_quick_config', 1);
       $this->_params['is_quick_config'] = 1;
     }
-    $this->assign('priceSetID', $this->_priceSetId);
+    $this->assign('is_quick_config', $this->isQuickConfig());
+    $this->assign('priceSetID', $this->getPriceSetID());
     $this->assign('useForMember', $this->get('useForMember'));
 
     if (!empty($this->_values['honoree_profile_id']) && !empty($params['soft_credit_type_id'])) {
diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index e387bf4b4f..ccc677fe71 100644
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -42,7 +42,7 @@
         </tr>
 
       {/foreach}
-      {if $form.auto_renew}
+      {if array_key_exists('auto_renew', $form)}
         <tr id="allow_auto_renew">
           <td style="width: auto;">{$form.auto_renew.html}</td>
           <td style="width: auto;">
-- 
2.25.1