From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 26 Jan 2015 23:18:54 +0000 (+1300)
Subject: rename contribution type to financial type
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2883c2b2abcc78679b8d3968cf76b60627be35d2;p=civicrm-core.git

rename contribution type to financial type
---

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index d19c71e82a..38f42056a2 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -2200,9 +2200,9 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
    * @return CRM_Contribute_BAO_Contribution
    */
   public static function processSecondaryFinancialTransaction($contactID, &$form, $tempParams, $isTest, $lineItems, $minimumFee, $financialTypeID) {
-    $contributionType = new CRM_Financial_DAO_FinancialType();
-    $contributionType->id = $financialTypeID;
-    if (!$contributionType->find(TRUE)) {
+    $financialType = new CRM_Financial_DAO_FinancialType();
+    $financialType->id = $financialTypeID;
+    if (!$financialType->find(TRUE)) {
       CRM_Core_Error::fatal(ts("Could not find a system table"));
     }
     $tempParams['amount'] = $minimumFee;
@@ -2254,7 +2254,7 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
       $tempParams,
       $result,
       $contactID,
-      $contributionType,
+      $financialType,
       $pending,
       TRUE,
       $isTest,