Skip to content

Commit

Permalink
Sessions: Parse dates wihout time - refs BT#15394 #2801
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC committed Mar 18, 2019
1 parent 742fbb3 commit 08686dd
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions main/inc/lib/sessionmanager.lib.php
Expand Up @@ -9272,19 +9272,21 @@ private static function convertSessionDateToString($startDate, $endDate, $showTi
$dateHuman
);

$format = $showTime ? DATE_TIME_FORMAT_LONG_24H : DATE_FORMAT_LONG_NO_DAY;

$result = '';
if (!empty($startDateToLocal) && !empty($endDateToLocal)) {
$result = sprintf(
get_lang('FromDateXToDateY'),
api_format_date($startDateToLocal, DATE_TIME_FORMAT_LONG_24H),
api_format_date($endDateToLocal, DATE_TIME_FORMAT_LONG_24H)
api_format_date($startDateToLocal, $format),
api_format_date($endDateToLocal, $format)
);
} else {
if (!empty($startDateToLocal)) {
$result = get_lang('From').' '.api_format_date($startDateToLocal, DATE_TIME_FORMAT_LONG_24H);
$result = get_lang('From').' '.api_format_date($startDateToLocal, $format);
}
if (!empty($endDateToLocal)) {
$result = get_lang('Until').' '.api_format_date($endDateToLocal, DATE_TIME_FORMAT_LONG_24H);
$result = get_lang('Until').' '.api_format_date($endDateToLocal, $format);
}
}
if (empty($result)) {
Expand Down

0 comments on commit 08686dd

Please sign in to comment.