From 677730bdd8699fa5c2efa80ed56d6ea93420557c Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 12 Jul 2015 19:34:44 +1200 Subject: [PATCH] fix function signature & remove unused code --- CRM/Core/Payment.php | 2 +- CRM/Member/Form/MembershipRenewal.php | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php index b5176bf850..4ae367fce3 100644 --- a/CRM/Core/Payment.php +++ b/CRM/Core/Payment.php @@ -247,7 +247,7 @@ abstract class CRM_Core_Payment { * - pre_approval_parameters (this will be stored on the calling form & available later) * - redirect_url (if set the browser will be redirected to this. */ - public function doPreApproval($params) {} + public function doPreApproval(&$params) {} /** * Get any details that may be available to the payment processor due to an approval process having happened. diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 507e0d20a8..dece266604 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -523,11 +523,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { $formValues['email-5'] = $formValues['email-Primary'] = $this->_contributorEmail; $formValues['register_date'] = $now; - // now set the values for the billing location. - foreach ($this->_fields as $name => $dontCare) { - $fields[$name] = 1; - } - // also add location name to the array $formValues["address_name-{$this->_bltID}"] = CRM_Utils_Array::value('billing_first_name', $formValues) . ' ' . CRM_Utils_Array::value('billing_middle_name', $formValues) . ' ' . CRM_Utils_Array::value('billing_last_name', $formValues); -- 2.25.1