From 5ffb6bec985909aaa7902459017f660e8f2ce66b Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Wed, 6 Sep 2017 16:41:06 +0200 Subject: [PATCH] updated mysql-syntax from last commit --- install/lib/installer_base.lib.php | 6 ++---- install/lib/update.lib.php | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index a81e563fab..a2e1f89360 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -234,14 +234,12 @@ class installer_base { die(); } - $unwanted_sql_plugins = array('validate_password'); - $temp = '"'.implode('","', $unwanted_sql_plugins).'"'; - $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ($temp)"); + $unwanted_sql_plugins = array('validate_password'); + $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins); if(is_array($sql_plugins) && !empty($sql_plugins)) { foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];"; die(); } - unset($temp); //** Create the database if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) { diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index baba200052..6f29acefd3 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -133,13 +133,11 @@ function updateDbAndIni() { } $unwanted_sql_plugins = array('validate_password'); - $temp = '"'.implode('","', $unwanted_sql_plugins).'"'; - $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ($temp)"); + $sql_plugins = $inst->db->queryAllRecords("SELECT plugin_name FROM information_schema.plugins WHERE plugin_status='ACTIVE' AND plugin_name IN ?", $unwanted_sql_plugins); if(is_array($sql_plugins) && !empty($sql_plugins)) { foreach ($sql_plugins as $plugin) echo "Login in to MySQL and disable $plugin[plugin_name] with:\n\n UNINSTALL PLUGIN $plugin[plugin_name];"; die(); } - unset($temp); //* Update $conf array with values from the server.ini that shall be preserved $tmp = $inst->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']); -- GitLab