From f7908f483828885f7e145822866a12fba7eae2fd Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 31 Jan 2017 15:46:56 +0100 Subject: [PATCH] Now times under 1 day will be shown in a correct format. Ticket #215 (cherry picked from commit 3976a45e898a33f605830f326ff0cfea903ede39) --- pandora_console/include/functions_graph.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 96bd8a5f8f..f13e3c9d7b 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -987,11 +987,8 @@ function graphic_combined_module ($module_list, $weight_list, $period, } // Set the title and time format - if ($temp_range <= SECONDS_6HOURS) { - $time_format = 'H:i:s'; - } - elseif ($temp_range < SECONDS_1DAY) { - $time_format = 'H:i'; + if ($temp_range <= SECONDS_1DAY) { + $time_format = 'd.m.Y H:i:s'; } elseif ($temp_range < SECONDS_15DAYS) { $time_format = 'M d';