From: Krinkle Date: Tue, 16 Jul 2019 11:50:30 +0000 (+0000) Subject: Revert "RedirectSpecialPage: handle interwiki redirects." X-Git-Tag: 1.34.0-rc.0~986^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=b59ab95f916762546182de4da0486e2ae151ece0 Revert "RedirectSpecialPage: handle interwiki redirects." This reverts commit 41106688abbe6dfff61c5642924ced42af3f0d33. The original case is changed by this commit from a MediaWiki fatal exception with HTTP 500, to a blank 200 response due to silent failure. Use of GoToInterwiki appears to be invalid at this point in the code. Reverting to keep prod the same as last week, so as to unblock the train. Bug: T227700 Change-Id: Ieece956d2e2e4c21b5ed7a75890b9f11eaf07e66 --- diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index 3934cd2aa8..69f23c1d13 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -260,16 +260,8 @@ class MediaWiki { ) { list( , $subpage ) = $spFactory->resolveAlias( $title->getDBkey() ); $target = $specialPage->getRedirect( $subpage ); - // Target can also be true. We let that case fall through to normal processing. + // target can also be true. We let that case fall through to normal processing. if ( $target instanceof Title ) { - if ( $target->isExternal() ) { - // Handle interwiki redirects - $target = SpecialPage::getTitleFor( - 'GoToInterwiki', - $target->getPrefixedDBkey() - ); - } - $query = $specialPage->getRedirectQuery( $subpage ) ?: []; $request = new DerivativeRequest( $this->context->getRequest(), $query ); $request->setRequestURL( $this->context->getRequest()->getRequestURL() );