Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1

This commit is contained in:
m-lopez-f 2015-06-01 13:37:47 +02:00
commit 58115b8296

View File

@ -4368,6 +4368,12 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
if (modules_is_disable_agent($sla['id_agent_module'])) {
if (($config ['metaconsole'] == 1) && defined('METACONSOLE')) {
//Restore db connection
metaconsole_restore_db();
}
continue;
}
@ -5657,6 +5663,12 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
if (modules_is_disable_agent($item['id_agent_module'])) {
//Restore dbconnection
if (($config ['metaconsole'] == 1) && $server_name != '' && defined('METACONSOLE')) {
metaconsole_restore_db();
}
continue;
}