Merge branch 'master' into 'master'

Fix Issue #4402 - install/update when MySQL server is on custom port



See merge request !502

Author: Till Brehm

install/install.php

@@ -278,7 +278,7 @@
 	// initialize the connection to the master database
 	$inst->dbmaster = new db();
 	if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
-	$inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
+	$inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_port"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
 	$inst->dbmaster->setDBName($conf['mysql']["master_database"]);
 
 } else {

install/lib/mysql.lib.php

@@ -96,15 +96,16 @@ private function do_connect() {
 		$this->_setCharset();
 	}
 
-	public function setDBData($host, $user, $password) {
+	public function setDBData($host, $port, $user, $password) {
 		$this->dbHost = $host;
+		$this->dbPort = $port;
 		$this->dbUser = $user;
 		$this->dbPass = $password;
 	}
 
 	public function setDBName($name) {
 		$this->dbName = $name;
-		$this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass);
+		$this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass, '', $this->dbPort);
 		if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
 			$this->close();
 			$this->_sqlerror('Datenbank nicht gefunden / Database not found');

install/update.php

@@ -271,7 +271,7 @@
 	// initialize the connection to the master database
 	$inst->dbmaster = new db();
 	if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
-	$inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
+	$inst->dbmaster->setDBData($conf['mysql']["master_host"], $conf['mysql']["master_port"], $conf['mysql']["master_admin_user"], $conf['mysql']["master_admin_password"]);
 	$inst->dbmaster->setDBName($conf['mysql']["master_database"]);
 } else {
 	$inst->dbmaster = $inst->db;