From 4948486eff9a71aba05dba84d30b6cf4c428443a Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 14 Jun 2012 10:11:35 +0000 Subject: [PATCH] 2012-06-14 Ramon Novoa * include/functions_graph.php: Merged from 4.0 branch. Added history database support to combined graphs. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_graph.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fb6593a0d7..b4d71f9770 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-06-14 Ramon Novoa + + * include/functions_graph.php: Merged from 4.0 branch. Added history + database support to combined graphs. + 2012-06-13 Miguel de Dios * include/functions_config.php, include/functions_ui.php, diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index ed435c6291..3804303d82 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -582,7 +582,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $ "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('datos', 'utimestamp')); + array ('datos', 'utimestamp'), 'AND', true); if ($data === false) { $data = array (); }