X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=faca533618eb821bd84fd1ed2604939c6d02601f;hb=0eadfdeb17f6bcdc752e726aa5859d6cf32670d2;hp=f7e57fc94c644f6f48e6a3fda65043011181e7fd;hpb=939199bcea28a3b13c49c0f808d11d415660b924;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index f7e57fc94c..faca533618 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;
 	}
 
 	/**
@@ -505,8 +495,15 @@ class MediaWiki {
 			$action->show();
 			return;
 		}
-
-		if ( Hooks::run( 'UnknownAction', [ $request->getVal( 'action', 'view' ), $page ] ) ) {
+		// NOTE: deprecated hook. Add to $wgActions instead
+		if ( Hooks::run(
+			'UnknownAction',
+			[
+				$request->getVal( 'action', 'view' ),
+				$page
+			],
+			'1.19'
+		) ) {
 			$output->setStatusCode( 404 );
 			$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 		}