Merge "Revert "Fix the web updater""

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index cbb79f8..64a4077 100644 (file)
--- 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
         *