From 4ce4a9289902414aa4e6fd2cec0c2dfe39d5cfb9 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 20 May 2014 00:02:24 +1200
Subject: [PATCH] remove unused paramter deductible mode

---
 CRM/Contribute/BAO/Contribution/Utils.php    |  6 +++---
 CRM/Contribute/Form/Contribution.php         |  3 +--
 CRM/Contribute/Form/Contribution/Confirm.php | 16 ++++++++--------
 CRM/Member/BAO/Membership.php                |  4 ++--
 CRM/Member/Form/Membership.php               |  1 -
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index b9c0864327..2193832c6e 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -111,7 +111,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
         NULL,
         $contactID,
         $contributionType,
-        TRUE, TRUE, TRUE
+        TRUE, TRUE
       );
 
       if ($contribution) {
@@ -230,7 +230,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
           NULL,
           $contactID,
           $contributionType,
-          TRUE, TRUE, TRUE
+          TRUE, TRUE
         );
 
         // restore cached values (part of fix for CRM-14354)
@@ -307,7 +307,7 @@ class CRM_Contribute_BAO_Contribution_Utils {
         $contribution = CRM_Contribute_Form_Contribution_Confirm::processContribution($form,
           $form->_params, $result,
           $contactID, $contributionType,
-          TRUE, $pending, TRUE
+          $pending, TRUE
         );
       }
       $form->postProcessPremium($premiumParams, $contribution);
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index c27932b18d..5ae247194b 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1563,7 +1563,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
         $result,
         $this->_contactID,
         $contributionType,
-        FALSE,
         TRUE,
         FALSE
       );
@@ -1657,7 +1656,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
         $result,
         $this->_contactID,
         $contributionType,
-        FALSE, FALSE, FALSE
+        FALSE, FALSE
       );
     }
 
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index c748dca105..3dbd34316f 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1072,14 +1072,15 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
    * Process the contribution
    *
    * @param $form
-   * @param $params
-   * @param $result
-   * @param $contactID
-   * @param $financialType
-   * @param bool $deductibleMode
+   * @param array $params
+   * @param array $result
+   * @param integer $contactID
+   * @param CRM_Contribute_BAO_FinancialType $financialType
    * @param bool $pending
    * @param bool $online
    *
+   * @throws Exception
+   * @internal param bool $deductibleMode
    * @return CRM_Contribute_DAO_Contribution
    * @access public
    */
@@ -1089,9 +1090,8 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     $result,
     $contactID,
     $financialType,
-    $deductibleMode = TRUE,
-    $pending        = FALSE,
-    $online         = TRUE
+    $pending,
+    $online
   ) {
     $transaction = new CRM_Core_Transaction();
     $className   = get_class($form);
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 1b42cc3758..ae660e3c5b 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1370,8 +1370,8 @@ AND civicrm_membership.is_test = %2";
           $result,
           $contactID,
           $contributionType,
-          TRUE,
-          $pending
+          $pending,
+          TRUE
         );
       }
     }
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 6ed0cff84d..239a916e81 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1446,7 +1446,6 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
           $result,
           $this->_contributorContactID,
           $contributionType,
-          FALSE,
           TRUE,
           FALSE
         );
-- 
2.25.1