From f7248cb7cf51a75b49aefa66be288971d76ccf8c Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Wed, 26 Aug 2015 06:39:23 +1200 Subject: [PATCH] CRM-11338, CRM-16454 remove last instance of passing pending to processFormContribution The parameter has been 'on the way out' through the 4.7 refactor & as part of writing tests for CRM-11338 remove the last instance. This needs to happen as I've seen that otherwise use of it is at risk of being merged back in from 4.6 patches --- CRM/Contribute/BAO/Contribution/Utils.php | 1 - CRM/Contribute/Form/Contribution.php | 1 - CRM/Contribute/Form/Contribution/Confirm.php | 6 +----- CRM/Member/Form/Membership.php | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php index 106596202a..b5643ff411 100644 --- a/CRM/Contribute/BAO/Contribution/Utils.php +++ b/CRM/Contribute/BAO/Contribution/Utils.php @@ -125,7 +125,6 @@ class CRM_Contribute_BAO_Contribution_Utils { $contributionParams, $financialType, TRUE, - TRUE, $form->_bltID ); diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 8a4ce9749b..c0220d852b 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1222,7 +1222,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP NULL, $contributionParams, $financialType, - TRUE, FALSE, $this->_bltID ); diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 1525bcf814..d5f22c64d9 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -810,8 +810,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr * - thankyou_date (not all forms will set this) * * @param CRM_Financial_DAO_FinancialType $financialType - * @param bool $pending - * The intention is this should always be TRUE and we are refactoring towards any completion happening elsewhere. * @param bool $online * Is the form a front end form? If so set a bunch of unpredictable things that should be passed in from the form. * @@ -827,7 +825,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $result, $contributionParams, $financialType, - $pending, $online, $billingLocationID ) { @@ -892,7 +889,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr if (isset($params['amount'])) { $contributionParams = array_merge(self::getContributionParams( - $params, $financialType->id, $nonDeductibleAmount, $pending, + $params, $financialType->id, $nonDeductibleAmount, TRUE, $result, $receiptDate, $recurringContributionID), $contributionParams ); @@ -1797,7 +1794,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr $result, $contributionParams, $financialType, - $pending, TRUE, $form->_bltID ); diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 6da29b322f..6e63912358 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1485,7 +1485,6 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { 'payment_instrument_id' => $this->_paymentProcessor['payment_instrument_id'], ), $financialType, - TRUE, FALSE, $this->_bltID ); -- 2.25.1