From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 21 Sep 2016 19:55:45 +0000 (-0700)
Subject: Remove dangling $wgDBmysql5 usage from DatabaseMysqli
X-Git-Tag: 1.31.0-rc.0~5415^2
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=161c6c85a7909f64ca7cf410ac7dc4a6e3989f28;p=lhc%2Fweb%2Fwiklou.git

Remove dangling $wgDBmysql5 usage from DatabaseMysqli

Change-Id: Iee21655e12eb3001496123ff8438adc1c39ecdf8
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index e46860116d..fb983bdde0 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -54,8 +54,6 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 	 * @throws DBConnectionError
 	 */
 	protected function mysqlConnect( $realServer ) {
-		global $wgDBmysql5;
-
 		# Avoid suppressed fatal error, which is very hard to track down
 		if ( !function_exists( 'mysqli_init' ) ) {
 			throw new DBConnectionError( $this, "MySQLi functions missing,"
@@ -101,7 +99,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 			$realServer = 'p:' . $realServer;
 		}
 
-		if ( $wgDBmysql5 ) {
+		if ( $this->utf8Mode ) {
 			// Tell the server we're communicating with it in UTF-8.
 			// This may engage various charset conversions.
 			$mysqli->options( MYSQLI_SET_CHARSET_NAME, 'utf8' );