From: Eileen McNaughton Date: Mon, 9 Oct 2023 21:30:34 +0000 (+1300) Subject: Stop passing variable no longer in signature X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=23ac2ee7c80137b1682e9ab786e7bb55fbdbcc43;p=civicrm-core.git Stop passing variable no longer in signature --- diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 8ea0d4fe32..50f54285ca 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1335,7 +1335,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP // add these values for the recurringContrib function ,CRM-10188 $params['financial_type_id'] = $financialType->id; - $contributionParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params, $billingLocationID); + $contributionParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params); //@todo - this is being set from the form to resolve CRM-10188 - an // eNotice caused by it not being set @ the front end diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 0da5a223ce..3888192b62 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1047,7 +1047,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr // add these values for the recurringContrib function ,CRM-10188 $params['financial_type_id'] = $financialType->id; - $contributionParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params, $billingLocationID); + $contributionParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params); //@todo - this is being set from the form to resolve CRM-10188 - an // eNotice caused by it not being set @ the front end diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index e643167cd2..1121f6db7c 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1693,7 +1693,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment } $contribParams['revenue_recognition_date'] = $this->getRevenueRecognitionDate(); - $contribParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params, $form->_bltID); + $contribParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params); $contribParams['skipLineItem'] = 1; $contribParams['skipCleanMoney'] = 1; diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php index d23e700252..647e74c702 100644 --- a/CRM/Event/Form/Registration/Confirm.php +++ b/CRM/Event/Form/Registration/Confirm.php @@ -1012,7 +1012,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { // The concept of contributeMode is deprecated. Elsewhere we use the function processBillingAddress() - although // currently that is only inherited by back-office forms. if ($form->_contributeMode != 'notify' && empty($params['is_pay_later'])) { - $contribParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params, $form->_bltID); + $contribParams['address_id'] = CRM_Contribute_BAO_Contribution::createAddress($params); } $contribParams['skipLineItem'] = 1;