From 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 15 Feb 2016 03:38:06 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/lib/installer_base.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index e7a664d..363a38c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -263,7 +263,7 @@
}
// Delete ISPConfig user in the local database, in case that it exists
- $this->db->query("DROP USER ?'@'? ", $conf['mysql']['ispconfig_user'], $from_host);
+ $this->db->query("DROP USER ?@?", $conf['mysql']['ispconfig_user'], $from_host);
$this->db->query("DROP DATABASE IF EXISTS ?", $conf['mysql']['database']);
//* Create the ISPConfig database user in the local database
--
Gitblit v1.9.1