From 1da41104b6af2304576eb866e7317e59ed42609e Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Fri, 15 Mar 2013 14:21:41 -0400 Subject: [PATCH] fixes CRM-12125: format case start date using localisation settings, otherwise defaults to AM/PM. --- CRM/Case/Form/Activity/ChangeCaseStartDate.php | 2 +- CRM/Case/Form/Activity/OpenCase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Case/Form/Activity/ChangeCaseStartDate.php b/CRM/Case/Form/Activity/ChangeCaseStartDate.php index 57012650ba..d9fd59c0ce 100644 --- a/CRM/Case/Form/Activity/ChangeCaseStartDate.php +++ b/CRM/Case/Form/Activity/ChangeCaseStartDate.php @@ -72,7 +72,7 @@ class CRM_Case_Form_Activity_ChangeCaseStartDate { // store activity id for updating it later $form->openCaseActivityId = $openCaseInfo['id']; - list($defaults['start_date'], $defaults['start_date_time']) = CRM_Utils_Date::setDateDefaults($openCaseInfo['activity_date']); + list($defaults['start_date'], $defaults['start_date_time']) = CRM_Utils_Date::setDateDefaults($openCaseInfo['activity_date'], 'activityDateTime'); } return $defaults; } diff --git a/CRM/Case/Form/Activity/OpenCase.php b/CRM/Case/Form/Activity/OpenCase.php index 47581849b5..35a72fe1b0 100644 --- a/CRM/Case/Form/Activity/OpenCase.php +++ b/CRM/Case/Form/Activity/OpenCase.php @@ -87,7 +87,7 @@ class CRM_Case_Form_Activity_OpenCase { return $defaults; } - list($defaults['start_date'], $defaults['start_date_time']) = CRM_Utils_Date::setDateDefaults(); + list($defaults['start_date'], $defaults['start_date_time']) = CRM_Utils_Date::setDateDefaults(NULL, 'activityDateTime'); // set default case status, case type, encounter medium, location type and phone type defaults are set in DB $caseStatus = CRM_Core_OptionGroup::values('case_status', FALSE, FALSE, FALSE, 'AND is_default = 1'); -- 2.25.1