From a7b9cc4946a2f7fb081f64d9230bf944736a185b Mon Sep 17 00:00:00 2001 From: Paladox Date: Wed, 24 May 2017 21:43:30 +0000 Subject: [PATCH] Revert "Fix the web updater" May be causing beta to break, if that's true then we are going to revert 6519c42d248a78d2d42edee1beb21f926d227044 This reverts commit 5d56bcb925af653fed427e90a1cfb982de386720. Change-Id: I5e9df08dc1583266bb11b52d5d68bf393e4c0fff --- includes/installer/MysqlInstaller.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 4f0b66c1d4..09051f410d 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -179,8 +179,8 @@ class MysqlInstaller extends DatabaseInstaller { # Determine existing default character set if ( $conn->tableExists( "revision", __METHOD__ ) ) { - $revision = $this->escapeLikeInternal( $this->getVar( 'wgDBprefix' ) . 'revision', '\\' ); - $res = $conn->query( "SHOW TABLE STATUS LIKE '$revision'", __METHOD__ ); + $revision = $conn->buildLike( $this->getVar( 'wgDBprefix' ) . 'revision' ); + $res = $conn->query( "SHOW TABLE STATUS $revision", __METHOD__ ); $row = $conn->fetchObject( $res ); if ( !$row ) { $this->parent->showMessage( 'config-show-table-status' ); @@ -221,16 +221,6 @@ class MysqlInstaller extends DatabaseInstaller { $wgDBpassword = $this->getVar( '_InstallPassword' ); } - /** - * @param string $s - * @return string - */ - protected function escapeLikeInternal( $s, $escapeChar = '`' ) { - return str_replace( [ $escapeChar, '%', '_' ], - [ "{$escapeChar}{$escapeChar}", "{$escapeChar}%", "{$escapeChar}_" ], - $s ); - } - /** * Get a list of storage engines that are available and supported * -- 2.20.1