From 28d4d481c0554b45aa12155c7250db57c9c7a561 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 14:56:53 -0800 Subject: [PATCH] INFRA-132 - CRM/Case - Misc --- CRM/Case/BAO/Case.php | 5 +++-- CRM/Case/BAO/Query.php | 3 ++- CRM/Case/Selector/Search.php | 3 ++- CRM/Case/XMLProcessor/Report.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 987e089196..e8fa07847c 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -2359,8 +2359,9 @@ INNER JOIN civicrm_case_contact ON ( civicrm_case.id = civicrm_case_contact.cas * @return integer|NULL * @static */ - static function mergeCases($mainContactId, $mainCaseId = NULL, $otherContactId = NULL, - $otherCaseId = NULL, $changeClient = FALSE) { + static function mergeCases( + $mainContactId, $mainCaseId = NULL, $otherContactId = NULL, + $otherCaseId = NULL, $changeClient = FALSE) { $moveToTrash = TRUE; $duplicateContacts = FALSE; diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php index 0890a48650..49ec82f2b5 100644 --- a/CRM/Case/BAO/Query.php +++ b/CRM/Case/BAO/Query.php @@ -615,7 +615,8 @@ case_relation_type.id = case_relationship.relationship_type_id )"; * * @return array|null */ - static function defaultReturnProperties($mode, + static function defaultReturnProperties( + $mode, $includeCustomFields = TRUE ) { diff --git a/CRM/Case/Selector/Search.php b/CRM/Case/Selector/Search.php index 10af1d82a0..daf9572657 100644 --- a/CRM/Case/Selector/Search.php +++ b/CRM/Case/Selector/Search.php @@ -145,7 +145,8 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base { * @return \CRM_Case_Selector_Search @access public */ - function __construct(&$queryParams, + function __construct( + &$queryParams, $action = CRM_Core_Action::NONE, $additionalClause = NULL, $single = FALSE, diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index f2ebe640f9..ee118512d4 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -95,7 +95,8 @@ class CRM_Case_XMLProcessor_Report extends CRM_Case_XMLProcessor { * * @return array */ - function &caseInfo($clientID, + function &caseInfo( + $clientID, $caseID ) { $case = $this->_redactionRegexRules = array(); -- 2.25.1