From dfa81da9904a0f6fecf81fab7efe44ebb24cd403 Mon Sep 17 00:00:00 2001
From: Jon goldberg <jon@palantetech.coop>
Date: Fri, 6 Jan 2017 12:25:53 -0500
Subject: [PATCH] CRM-19608 - Show/hide auto-renew element on membership pages
 even when a non-quick price set is used

---
 CRM/Price/BAO/PriceField.php                                   | 2 +-
 templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 5b56b2eeaa..b9aca53d00 100644
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -414,7 +414,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           if (!empty($qf->_quickConfig) && $field->name == 'contribution_amount') {
             $extra += array('onclick' => 'clearAmountOther();');
           }
-          elseif (!empty($qf->_quickConfig) && $field->name == 'membership_amount') {
+          if ($field->name == 'membership_amount') {
             $extra += array(
               'onclick' => "return showHideAutoRenew({$opt['membership_type_id']});",
               'membership-type' => $opt['membership_type_id'],
diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index e6b5fdd3e1..5ad2a03225 100644
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -227,7 +227,7 @@ CRM.$(function($) {
     {/strip}
 {/if}
 {* Include JS for auto renew membership if priceset is Quick Config*}
-{if $membershipBlock AND $quickConfig}
+{if $membershipBlock}
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-- 
2.25.1