From 160a7ef52f60ee16c181483d0fa770d51d5a8f1a Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 8 Aug 2017 07:30:43 +1000 Subject: [PATCH] Minor comment fixes and further reduction of passing by reference with changing to new wrapper functions --- CRM/Financial/BAO/FinancialType.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index ddcde1b810..b8a95c53d3 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -246,7 +246,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { } /** - * Wrapper aroung getAvaliableFinancialTypes to get all including disabled FinancialTypes + * Wrapper aroung getAvailableFinancialTypes to get all including disabled FinancialTypes * @param int|string $action * the type of action, can be add, view, edit, delete * @param bool $resetCache @@ -263,7 +263,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { } /** - * Wrapper aroung getAvaliableFinancialTypes to get all FinancialTypes Excluding Disabled ones. + * Wrapper aroung getAvailableFinancialTypes to get all FinancialTypes Excluding Disabled ones. * @param int|string $action * the type of action, can be add, view, edit, delete * @param bool $resetCache @@ -377,7 +377,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { } else { if ($component == 'contribution') { - self::getAvailableFinancialTypes($types); + $types = self::getAllEnabledAvailableFinancialTypes(); $column = "financial_type_id"; } if ($component == 'membership') { @@ -447,8 +447,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { if (!self::isACLFinancialTypeStatus()) { return TRUE; } - // @todo consider adding back in disabled types here. - CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes, CRM_Core_Action::UPDATE); + $financialTypes = CRM_Financial_BAO_FinancialType::getAllAvailableFinancialTypes(CRM_Core_Action::UPDATE); return isset($financialTypes[$financialTypeID]); } -- 2.25.1