From 0cdc24357e6a4ee984cd81106ef40e7b5058debe Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 25 Oct 2023 09:21:13 +1300
Subject: [PATCH] Remove references to empty price set, we are within a loop of
 that var

---
 CRM/Financial/BAO/Order.php           | 2 +-
 templates/CRM/Price/Form/PriceSet.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Financial/BAO/Order.php b/CRM/Financial/BAO/Order.php
index 849f9ee458..ca74b7d44c 100644
--- a/CRM/Financial/BAO/Order.php
+++ b/CRM/Financial/BAO/Order.php
@@ -686,7 +686,7 @@ class CRM_Financial_BAO_Order {
             if ($membershipType['auto_renew'] && empty($this->priceSetMetadata['auto_renew_membership_field'])) {
               // Quick form layer supports one auto-renew membership type per price set. If we
               // want more for any reason we can add another array property.
-              $this->priceSetMetadata['auto_renew_membership_field'] = (int) $option['id'];
+              $this->priceSetMetadata['auto_renew_membership_field'] = (int) $option['price_field_id'];
             }
           }
         }
diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl
index 46f317b4be..4281651678 100644
--- a/templates/CRM/Price/Form/PriceSet.tpl
+++ b/templates/CRM/Price/Form/PriceSet.tpl
@@ -96,7 +96,7 @@
 
             {/if}
               {if !empty($extends) && $extends eq "Membership"}
-                {if (!empty($priceSet) && $element.id == $priceSet.auto_renew_membership_field) || (empty($priceSet) && $element.name == 'membership_amount')}
+                {if ($element.id == $priceSet.auto_renew_membership_field)}
                   <div id="allow_auto_renew">
                     <div class='crm-section auto-renew'>
                       <div class='label'></div>
-- 
2.25.1