From 4a2b85502eddb4f182469da0d32057a4be591437 Mon Sep 17 00:00:00 2001 From: Edsel Date: Mon, 14 Sep 2015 12:47:38 +0530 Subject: [PATCH] ICM-18 Jenkins fixes Conflicts: CRM/Report/Form.php --- CRM/Financial/BAO/FinancialType.php | 2 +- CRM/Report/Form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index 38c5c4e603..fbed515e72 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -309,7 +309,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { /** * Function to build a permissioned sql where clause based on available financial types. * - * @param array $whereclauses + * @param array $whereClauses * (reference ) an array of clauses * @param string $component * the type of component diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 1358f94be5..de9f2fd7b9 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -4494,7 +4494,7 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a } /* - * Generate temporary table to hold all contributions with permissioned FTs. + * Generate temporary table to hold all contributions with permissioned FTs. * * @param object $query * @param string $alias -- 2.25.1