Merge branch 'master' into 'stable-3.1'

Marius Burkard · Marius Burkard · commit d302d8e556da · 2016-02-15T08:34:46.000+01:00
we can´t connect to the missing db during install ;)



See merge request !282
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`//* Initialize the MySQL server connection`
`211`		`- 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)) {`
	`211`	`+ if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, '', (int)$tmp_mysql_server_port)) {`
`212`	`212`	`$conf['mysql']['host'] = $tmp_mysql_server_host;`
`213`	`213`	`$conf['mysql']['port'] = $tmp_mysql_server_port;`
`214`	`214`	`$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;`