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

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 106596202ab6eb65ab292b3c90d5be8d44fecb09..b5643ff4110d78212bedcb711e2438a0092b472f 100644 (file)
--- 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 8a4ce9749b18b37ce445abafd479d2c512ddb0a5..c0220d852b58cc6e041b1cfe4f7e266fbce7c5b5 100644 (file)
--- 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 1525bcf814cb9db259804fe459851634c184f79d..d5f22c64d9cab0f9059b358e4b69270d60184aaf 100644 (file)
--- 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 6da29b322f4cf92998c31a0089e4f893ce37c69c..6e639123588d9a034bcffece41e83dcdfce73b4e 100644 (file)
--- 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
         );