From b62f69b234540df64bbd12e1bbb739cc8e824bae Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 1 Dec 2021 12:11:44 +1300
Subject: [PATCH] Remove issets relating to auto_renew

On demo site these are hit at civicrm/contribute/transact?reset=1&id=2
---
 CRM/Contribute/Form/Contribution/Main.php                      | 1 +
 templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl | 2 +-
 templates/CRM/Price/Form/PriceSet.tpl                          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index b3c5c1cd35..b2734ff205 100644
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -549,6 +549,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
    */
   private function buildMembershipBlock($cid, $selectedMembershipTypeID = NULL, $isTest = NULL) {
     $separateMembershipPayment = FALSE;
+    $this->addOptionalQuickFormElement('auto_renew');
     if ($this->_membershipBlock) {
       $this->_currentMemberships = [];
 
diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 429c97b6ea..372b69efe8 100644
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -195,7 +195,7 @@
         </tr>
 
       {/foreach}
-      {if isset($form.auto_renew) }
+      {if $form.auto_renew}
         <tr id="allow_auto_renew">
           <td style="width: auto;">{$form.auto_renew.html}</td>
           <td style="width: auto;">
diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl
index 26520f58e2..400be17860 100644
--- a/templates/CRM/Price/Form/PriceSet.tpl
+++ b/templates/CRM/Price/Form/PriceSet.tpl
@@ -101,7 +101,7 @@
                     <div class='crm-section auto-renew'>
                       <div class='label'></div>
                       <div class='content' id="auto_renew_section">
-                        {if isset($form.auto_renew) }
+                        {if $form.auto_renew}
                           {$form.auto_renew.html}&nbsp;{$form.auto_renew.label}
                         {/if}
                       </div>
-- 
2.25.1