From 7ab1f6d85e11fa28f442c86ffb04e6860888de3e Mon Sep 17 00:00:00 2001 From: monishdeb Date: Tue, 29 Dec 2015 14:52:44 +0530 Subject: [PATCH] CRM-17673 fix - Update recurring billing details: update page fails https://issues.civicrm.org/jira/browse/CRM-17673 --- CRM/Contribute/Form/UpdateBilling.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 82fb453357..0a91ed99a0 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -65,7 +65,7 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { $this->_crid = CRM_Utils_Request::retrieve('crid', 'Integer', $this, FALSE); if ($this->_crid) { $this->_paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_crid, 'recur', 'info'); - $this->_paymentProcessorObj = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_crid, 'recur', 'obj'); + $this->_paymentProcessor['object'] = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_crid, 'recur', 'obj'); $this->_subscriptionDetails = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($this->_crid); // Are we cancelling a recurring contribution that is linked to an auto-renew membership? @@ -91,6 +91,8 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { $this->_mode = 'auto_renew'; } + $this->_paymentProcessorObj = CRM_Utils_Array::value('object', $this->_paymentProcessor); + if ((!$this->_crid && !$this->_coid && !$this->_mid) || ($this->_subscriptionDetails == CRM_Core_DAO::$_nullObject) ) { -- 2.25.1