fix function signature & remove unused code

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index b5176bf850a3c75cc52e92ce7d0617af95dc5868..4ae367fce352f510d495780ea4578e2217841606 100644 (file)
--- 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 507e0d20a82f45cf532f1b82bb7e077a7e085a91..dece266604e597aad1a4e5ef14c8ffc5626ce6d5 100644 (file)
--- 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);