Commit 5f221a95 authored by tbrehm's avatar tbrehm
Browse files

Fixed bugs in updater.

parent dba68fcd
...@@ -156,6 +156,7 @@ prepareDBDump(); ...@@ -156,6 +156,7 @@ prepareDBDump();
//* initialize the database //* initialize the database
$inst->db = new db(); $inst->db = new db();
$inst->db->dbName = $conf["mysql"]["database"];
/* /*
* The next line is a bit tricky! * The next line is a bit tricky!
......
...@@ -286,7 +286,8 @@ function updateDbAndIni() { ...@@ -286,7 +286,8 @@ function updateDbAndIni() {
} }
$new_ini = array_to_ini($tpl_ini_array); $new_ini = array_to_ini($tpl_ini_array);
$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']); $sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
$inst->db->query($sql);
unset($old_ini_array); unset($old_ini_array);
unset($tpl_ini_array); unset($tpl_ini_array);
unset($new_ini); unset($new_ini);
......
...@@ -152,6 +152,7 @@ prepareDBDump(); ...@@ -152,6 +152,7 @@ prepareDBDump();
//* initialize the database //* initialize the database
$inst->db = new db(); $inst->db = new db();
$inst->db->dbName = $conf["mysql"]["database"];
//* initialize the master DB, if we have a multiserver setup //* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') { if($conf['mysql']['master_slave_setup'] == 'y') {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment