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

2012-06-14 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
Ramon Novoa 2012-06-14 10:11:35 +00:00
parent 5bc0b9947f
commit 4948486eff
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-14 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php: Merged from 4.0 branch. Added history
database support to combined graphs.
2012-06-13 Miguel de Dios <miguel.dedios@artica.es> 2012-06-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, include/functions_ui.php, * include/functions_config.php, include/functions_ui.php,

2
pandora_console/include/functions_graph.php
View File

@ -582,7 +582,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
"utimestamp > $datelimit", "utimestamp > $datelimit",
"utimestamp < $date", "utimestamp < $date",
'order' => 'utimestamp ASC'), 'order' => 'utimestamp ASC'),
array ('datos', 'utimestamp')); array ('datos', 'utimestamp'), 'AND', true);
if ($data === false) { if ($data === false) {
$data = array (); $data = array ();
} }