X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=eaa1c99539d72e249c590077be03f4d1f0bf4f89;hb=2c0db8f5e8593a51ae0acc8285fd40b7743b0fce;hp=218337a95a3720d713411e6f695f36f919dbfe3e;hpb=1e3c2e5904d628c001a8d65909b135ea9bf042aa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 218337a95a..eaa1c99539 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -313,8 +313,6 @@ class MediaWiki {
 	 * - Normalise empty title:
 	 *   /wiki/ -> /wiki/Main
 	 *   /w/index.php?title= -> /wiki/Main
-	 * - Normalise non-standard title urls:
-	 *   /w/index.php?title=Foo_Bar -> /wiki/Foo_Bar
 	 * - Don't redirect anything with query parameters other than 'title' or 'action=view'.
 	 *
 	 * @param Title $title
@@ -327,6 +325,8 @@ class MediaWiki {
 
 		if ( $request->getVal( 'action', 'view' ) != 'view'
 			|| $request->wasPosted()
+			|| ( $request->getVal( 'title' ) !== null
+				&& $title->getPrefixedDBkey() == $request->getVal( 'title' ) )
 			|| count( $request->getValueNames( [ 'action', 'title' ] ) )
 			|| !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] )
 		) {
@@ -341,19 +341,7 @@ class MediaWiki {
 		}
 		// Redirect to canonical url, make it a 301 to allow caching
 		$targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
-
-		if ( $targetUrl != $request->getFullRequestURL() ) {
-			$output->setCdnMaxage( 1200 );
-			$output->redirect( $targetUrl, '301' );
-			return true;
-		}
-
-		// If there is no title, or the title is in a non-standard encoding, we demand
-		// a redirect. If cgi somehow changed the 'title' query to be non-standard while
-		// the url is standard, the server is misconfigured.
-		if ( $request->getVal( 'title' ) === null
-			|| $title->getPrefixedDBkey() != $request->getVal( 'title' )
-		) {
+		if ( $targetUrl == $request->getFullRequestURL() ) {
 			$message = "Redirect loop detected!\n\n" .
 				"This means the wiki got confused about what page was " .
 				"requested; this sometimes happens when moving a wiki " .
@@ -375,7 +363,9 @@ class MediaWiki {
 			}
 			throw new HttpError( 500, $message );
 		}
-		return false;
+		$output->setSquidMaxage( 1200 );
+		$output->redirect( $targetUrl, '301' );
+		return true;
 	}
 
 	/**
@@ -676,14 +666,14 @@ class MediaWiki {
 	/**
 	 * @param string $url
 	 * @param IContextSource $context
-	 * @return string|bool Either "local" or "remote" if in the farm, false otherwise
+	 * @return string Either "local", "remote" if in the farm, "external" otherwise
 	 */
-	private function getUrlDomainDistance( $url, IContextSource $context ) {
+	private static function getUrlDomainDistance( $url, IContextSource $context ) {
 		static $relevantKeys = [ 'host' => true, 'port' => true ];
 
 		$infoCandidate = wfParseUrl( $url );
 		if ( $infoCandidate === false ) {
-			return false;
+			return 'external';
 		}
 
 		$infoCandidate = array_intersect_key( $infoCandidate, $relevantKeys );
@@ -705,7 +695,7 @@ class MediaWiki {
 			}
 		}
 
-		return false;
+		return 'external';
 	}
 
 	/**