From: Frank J. Gómez <frank@ginkgostreet.com>
Date: Mon, 28 Apr 2014 22:27:16 +0000 (-0700)
Subject: Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for members... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e34b39d2c859f279c808a6d7bb75c57b8b13ef80;p=civicrm-core.git

Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for memberships.

----------------------------------------
* CRM-14545: Contribution page does not respect "Contribution Amounts Label" when page is also used for memberships
  https://issues.civicrm.org/jira/browse/CRM-14545
---

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 52d64a023d..cfdd8d5f3d 100644
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -295,9 +295,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           $extra = array('onclick' => 'useAmountOther();');
         }
 
-        // if seperate membership payment is used with quick config priceset then change the other amount label
         if (!empty($qf->_membershipBlock) && !empty($qf->_quickConfig) && $field->name == 'other_amount' && empty($qf->_contributionAmount)) {
-          $label = ts('Additional Contribution');
           $useRequired = 0;
         }
         elseif (!empty($fieldOptions[$optionKey]['label'])) {      //check for label.