jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355554 )
Change subject: Revert "Fix the web updater"
......................................................................
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
---
M includes/installer/MysqlInstaller.php
1 file changed, 2 insertions(+), 12 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/MysqlInstaller.php
b/includes/installer/MysqlInstaller.php
index 4f0b66c..09051f4 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -179,8 +179,8 @@
# 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' );
@@ -219,16 +219,6 @@
# just copy these two
$wgDBuser = $this->getVar( '_InstallUser' );
$wgDBpassword = $this->getVar( '_InstallPassword' );
- }
-
- /**
- * @param string $s
- * @return string
- */
- protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
- return str_replace( [ $escapeChar, '%', '_' ],
- [ "{$escapeChar}{$escapeChar}", "{$escapeChar}%",
"{$escapeChar}_" ],
- $s );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/355554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e9df08dc1583266bb11b52d5d68bf393e4c0fff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: TTO <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
