From dec569605c977e047f519c0fdc2063563ab07dc6 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Sat, 8 Aug 2015 01:19:37 +0530 Subject: [PATCH] --CRM-16526, fixed jenkin warnings --- CRM/Contact/BAO/Query.php | 2 +- CRM/Financial/BAO/FinancialType.php | 4 ++-- CRM/Report/Form/Contribute/Repeat.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 2e8a5ee219..944abf5cf1 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -4765,7 +4765,7 @@ SELECT COUNT( conts.total_amount ) as total_count, civicrm_contribution.currency $from $completedWhere"; $from .= " LEFT JOIN civicrm_line_item li ON civicrm_contribution.id = li.contribution_id AND - li.entity_table = 'civicrm_contribution' AND li.financial_type_id NOT IN (" . implode(',' , array_keys($financialTypes)) . ") "; + li.entity_table = 'civicrm_contribution' AND li.financial_type_id NOT IN (" . implode(',', array_keys($financialTypes)) . ") "; $query = "$select FROM ( $innerQuery GROUP BY civicrm_contribution.id ) as conts diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index c92b135260..3eab56f137 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -251,7 +251,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { } if (!self::isACLFinancialTypeStatus()) { return $financialTypes; - } + } // check cached value if (CRM_Utils_Array::value($action, self::$_availableFinancialTypes) && !$resetCache) { $financialTypes = self::$_availableFinancialTypes[$action]; @@ -265,7 +265,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { self::$_availableFinancialTypes[$action] = $financialTypes; return $financialTypes; } - + public static function getAvailableMembershipTypes(&$membershipTypes = NULL, $action = 'view') { if (empty($membershipTypes)) { $membershipTypes = CRM_Member_PseudoConstant::membershipType(); diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php index 933f0922a9..bdf432343a 100644 --- a/CRM/Report/Form/Contribute/Repeat.php +++ b/CRM/Report/Form/Contribute/Repeat.php @@ -370,7 +370,7 @@ LEFT JOIN civicrm_temp_civireport_repeat2 {$this->_aliases['civicrm_contribution $this->_aliases['civicrm_contribution'] = $temp; $this->_where = ''; return $from; - } + } /** * @param string $replaceAliasWith * -- 2.25.1