From 161c6c85a7909f64ca7cf410ac7dc4a6e3989f28 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 21 Sep 2016 12:55:45 -0700 Subject: [PATCH] Remove dangling $wgDBmysql5 usage from DatabaseMysqli Change-Id: Iee21655e12eb3001496123ff8438adc1c39ecdf8 --- includes/libs/rdbms/database/DatabaseMysqli.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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' ); -- 2.20.1