X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabaseMysqli.php;h=a3907caa0622cf93cd0880fdbd797c8222cdb13a;hb=a38af7ba26579bb3004f673e44d39710887763aa;hp=6d9dabd80388fe12d5a4a03ee8777ead4d17604c;hpb=af363e85a0de038a4349de5f5bef22fc06cc998b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index 6d9dabd803..1a5cdab78d 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -37,7 +37,7 @@ use stdClass;
 class DatabaseMysqli extends DatabaseMysqlBase {
 	/**
 	 * @param string $sql
-	 * @return mysqli_result
+	 * @return mysqli_result|bool
 	 */
 	protected function doQuery( $sql ) {
 		$conn = $this->getBindingHandle();
@@ -53,10 +53,11 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 
 	/**
 	 * @param string $realServer
+	 * @param string|null $dbName
 	 * @return bool|mysqli
 	 * @throws DBConnectionError
 	 */
-	protected function mysqlConnect( $realServer ) {
+	protected function mysqlConnect( $realServer, $dbName ) {
 		# Avoid suppressed fatal error, which is very hard to track down
 		if ( !function_exists( 'mysqli_init' ) ) {
 			throw new DBConnectionError( $this, "MySQLi functions missing,"
@@ -77,9 +78,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 		} elseif ( substr_count( $realServer, ':' ) == 1 ) {
 			// If we have a colon and something that's not a port number
 			// inside the hostname, assume it's the socket location
-			$hostAndSocket = explode( ':', $realServer, 2 );
-			$realServer = $hostAndSocket[0];
-			$socket = $hostAndSocket[1];
+			list( $realServer, $socket ) = explode( ':', $realServer, 2 );
 		}
 
 		$mysqli = mysqli_init();
@@ -111,9 +110,15 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 		}
 		$mysqli->options( MYSQLI_OPT_CONNECT_TIMEOUT, 3 );
 
-		if ( $mysqli->real_connect( $realServer, $this->user,
-			$this->password, $this->dbName, $port, $socket, $connFlags )
-		) {
+		if ( $mysqli->real_connect(
+			$realServer,
+			$this->user,
+			$this->password,
+			$dbName,
+			$port,
+			$socket,
+			$connFlags
+		) ) {
 			return $mysqli;
 		}
 
@@ -132,11 +137,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	protected function mysqlSetCharset( $charset ) {
 		$conn = $this->getBindingHandle();
 
-		if ( method_exists( $conn, 'set_charset' ) ) {
-			return $conn->set_charset( $charset );
-		} else {
-			return $this->query( 'SET NAMES ' . $charset, __METHOD__ );
-		}
+		return $conn->set_charset( $charset );
 	}
 
 	/**
@@ -177,18 +178,6 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 		return $conn->affected_rows;
 	}
 
-	/**
-	 * @param string $db
-	 * @return bool
-	 */
-	function selectDB( $db ) {
-		$conn = $this->getBindingHandle();
-
-		$this->dbName = $db;
-
-		return $conn->select_db( $db );
-	}
-
 	/**
 	 * @param mysqli_result $res
 	 * @return bool