tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6320-10385-bug-timestamp-general-consola' into 'develop' 

Applying date format from configuration to date specification

See merge request artica/pandorafms!3457
This commit is contained in:
Daniel Rodriguez 2020-09-17 16:00:30 +02:00
parent c10dd5a77b 19831f833c
commit 48fff2ff4f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_ui.php
View File

@ -541,11 +541,9 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
pandora_setlocale();
$title = human_time_comparation($unixtime);
$strf_format = date2strftime_format($config['date_format'], $unixtime);
$data = strftime(
$strf_format,
$unixtime
);
$date = new DateTime();
$date->setTimestamp($unixtime);
$data = $date->format($config['date_format']);
} else if ($prominent == 'compact') {
$units = 'tiny';
$title = date($config['date_format'], $unixtime);