From 2aec6a10ed6383eda4467d5bbc637fc01b9c7efb Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 30 Jul 2019 08:31:03 +0200 Subject: [PATCH] argh, mixed up the If statement for mysql-version check Signed-off-by: Michael Kaufmann --- lib/Froxlor/Database/Manager/DbManagerMySQL.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Database/Manager/DbManagerMySQL.php b/lib/Froxlor/Database/Manager/DbManagerMySQL.php index 5c9dd8c8..c130ffcc 100644 --- a/lib/Froxlor/Database/Manager/DbManagerMySQL.php +++ b/lib/Froxlor/Database/Manager/DbManagerMySQL.php @@ -147,9 +147,9 @@ class DbManagerMySQL // as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+) if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) { - $drop_stmt = Database::prepare("DROP USER IF EXISTS :dbname@:host"); - } else { $drop_stmt = Database::prepare("DROP USER :dbname@:host"); + } else { + $drop_stmt = Database::prepare("DROP USER IF EXISTS :dbname@:host"); } while ($host = $host_res_stmt->fetch(\PDO::FETCH_ASSOC)) { Database::pexecute($drop_stmt, array( @@ -178,9 +178,9 @@ class DbManagerMySQL } // as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+) if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) { - $stmt = Database::prepare("DROP USER IF EXISTS :username@:host"); - } else { $stmt = Database::prepare("DROP USER :username@:host"); + } else { + $stmt = Database::prepare("DROP USER IF EXISTS :username@:host"); } Database::pexecute($stmt, array( "username" => $username,