2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* include/functions_graph.php
	 include/functions_reporting.php: Fixed custom graphs in preview 
	 reporting and PDF exportation.
	 
	 Fixes: #3444170



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5196 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,11 @@
+2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_graph.php
+	 include/functions_reporting.php: Fixed custom graphs in preview 
+	 reporting and PDF exportation.
+	 
+	 Fixes: #3444170
+
 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* operation/snmpconsole/snmp_view.php: Fixed trap validation when

pandora_console/include/functions_graph.php

@@ -378,7 +378,11 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 	global $config;
 	global $graphic_type;
 	
-	include_flash_chart_script();
+	$flash_charts = $config['flash_charts'];
+	
+	if ($flash_charts){
+		include_flash_chart_script();
+	}
 	
 	// Set the title and time format
 	
@@ -737,12 +741,10 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 		$time_format = 'M j';
 	}
 
-	$flash_charts = $config['flash_charts'];
-	
 	if ($only_image) {
 		$flash_charts = false;
 	}
-		
+
 	switch ($stacked) {
 		case GRAPH_AREA:
 			$color = null;

pandora_console/include/functions_reporting.php

@@ -2263,7 +2263,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
 				0,
 				0,
 				$graph["stacked"],
-				$report["datetime"]);
+				$report["datetime"],
+				true);
 			array_push ($table->data, $data);
 	
 			break;