From 08a4ce4efcac770c9af8c7e44d3f845324058731 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 22 Jul 2015 14:38:03 +1200 Subject: [PATCH] CRM-16882 renew my membership automatically should not show for non-auto-renew memberships I am not convinced this is the full story on CRM-16882 - however, it makes the symptom disappear, at least in one instance & the logic of the change is strong - ie. when iterating through the memberships to determine auto-renewability we should check whether they are auto-renew Conflicts: CRM/Member/BAO/Membership.php --- CRM/Contribute/Form/ContributionBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php index f211682344..a81bf836b5 100644 --- a/CRM/Contribute/Form/ContributionBase.php +++ b/CRM/Contribute/Form/ContributionBase.php @@ -932,7 +932,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { } elseif ($memType['is_active']) { $javascriptMethod = NULL; - $allowAutoRenewOpt = 1; + $allowAutoRenewOpt = (int) $memType['auto_renew']; if (is_array($this->_paymentProcessors)) { foreach ($this->_paymentProcessors as $id => $val) { if (!$val['is_recur']) { -- 2.25.1