From 45dc9648e8f18419319a0c215ccecde83dffe710 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 2 Sep 2011 10:13:06 +0000 Subject: [PATCH] 2011-09-02 Miguel de Dios * include/config_process.php: set by default the mysql connection type because in older isntallations update to 4 have not this token in config.php. Fixes: #3395947 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4891 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/config_process.php | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d7c3f47ae7..bf1c48698d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-09-02 Miguel de Dios + + * include/config_process.php: set by default the mysql connection type + because in older isntallations update to 4 have not this token in + config.php. + + Fixes: #3395947 + 2011-09-02 Juan Manuel Ramon * include/functions_alerts.php: fixed alerts_get_alert_agent_module_actions() diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c9a788f653..4163c523c1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -63,6 +63,12 @@ $config['start_time'] = microtime (true); $ownDir = dirname(__FILE__) . '/'; +//Set by default the MySQL connection for DB, because in older Pandora have not +//this token in the config.php +if (!isset($config['dbtype'])) { + $config['dbtype'] = 'mysql'; +} + require_once ($ownDir . 'functions_db.php'); require_once ($ownDir . 'functions.php');