From d302d8e556da5b1dcd9ce4f9ec086a0e4aa52dd6 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 15 Feb 2016 02:34:46 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/install.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/install.php b/install/install.php
index 1c413f9..e07546e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -208,7 +208,7 @@
}
//* Initialize the MySQL server connection
- if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) {
+ if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, '', (int)$tmp_mysql_server_port)) {
$conf['mysql']['host'] = $tmp_mysql_server_host;
$conf['mysql']['port'] = $tmp_mysql_server_port;
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
--
Gitblit v1.9.1