Merge branch '2285-La-ordenacion-de-elementos-en-las-custom-graph-no-se-aplica-en-las-graficas' into 'develop'

fixed bug when ordering module list in custom graphs See merge request artica/pandorafms!1583
2018-06-29 15:37:11 +02:00 · 2018-06-29 15:37:11 +02:00 · 5095ddaf3f
parent b7bd120411 ae1f7a4814
commit 5095ddaf3f
1 changed files with 2 additions and 1 deletions
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@ -1367,7 +1367,8 @@ function graphic_combined_module (
 		$sources = db_get_all_rows_field_filter(
 			'tgraph_source',
 			'id_graph',
-			$params_combined['id_graph']
+			$params_combined['id_graph'],
+			'field_order'
 		);

 		$series = db_get_all_rows_sql(