Skip to content

Commit 5ffb6be

Browse files
author
Florian Schaal
committed
updated mysql-syntax from last commit
1 parent 83957eb commit 5ffb6be

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

install/lib/installer_base.lib.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,12 @@ public function configure_database() {
234234
die();
235235
}
236236

237-
$unwanted_sql_plugins = array('validate_password');
238-
$temp = '"'.implode('","', $unwanted_sql_plugins).'"';
239-
$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ($temp)");
237+
$unwanted_sql_plugins = array('validate_password');
238+
$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
240239
if(is_array($sql_plugins) && !empty($sql_plugins)) {
241240
foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];";
242241
die();
243242
}
244-
unset($temp);
245243

246244
//** Create the database
247245
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) {

install/lib/update.lib.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,11 @@ function updateDbAndIni() {
133133
}
134134

135135
$unwanted_sql_plugins = array('validate_password');
136-
$temp = '"'.implode('","', $unwanted_sql_plugins).'"';
137-
$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ($temp)");
136+
$sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins);
138137
if(is_array($sql_plugins) && !empty($sql_plugins)) {
139138
foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];";
140139
die();
141140
}
142-
unset($temp);
143141

144142
//* Update $conf array with values from the server.ini that shall be preserved
145143
$tmp = $inst->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);

0 commit comments

Comments
 (0)