diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php index 78e6007291031bf9161f4cd991ce4a3e75a701af..e55da2bc90bcdf08668f1c0357c6daa050f18967 100644 --- a/modules/Vtiger/helpers/Util.php +++ b/modules/Vtiger/helpers/Util.php @@ -269,13 +269,16 @@ class Vtiger_Util_Helper { $dateTimeInUserFormat = Vtiger_Datetime_UIType::getDisplayDateTimeValue($dateTime); } - list($dateInUserFormat, $timeInUserFormat) = explode(' ', $dateTimeInUserFormat); - list($hours, $minutes, $seconds) = explode(':', $timeInUserFormat); - - $displayTime = $hours .':'. $minutes; - if ($currentUser->get('hour_format') === '12') { - $displayTime = Vtiger_Time_UIType::getTimeValueInAMorPM($displayTime); + list($dateInUserFormat, $timeInUserFormat, $meridiem) = explode(' ', $dateTimeInUserFormat); + if($meridiem && $currentUser->get('hour_format') === '12' ){ + $displayTime = $timeInUserFormat.' '.$meridiem; + } else { + list($hours, $minutes, $seconds) = explode(':', $timeInUserFormat); + $displayTime = $hours .':'. $minutes; + if ($currentUser->get('hour_format') === '12') { + $displayTime = Vtiger_Time_UIType::getTimeValueInAMorPM($displayTime); } + } /** * To support strtotime() for 'mm-dd-yyyy' format the separator should be '/'