From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sun, 28 Sep 2014 15:26:27 +0000 (+0200)
Subject: Article: Handle double redirects in data for mediawiki.action.view.redirect
X-Git-Tag: 1.31.0-rc.0~13771^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=39292da1a67e63797f09973af26e0af246089d0c;p=lhc%2Fweb%2Fwiklou.git

Article: Handle double redirects in data for mediawiki.action.view.redirect

Bug: 71002
Change-Id: Id7dd37a4865635d3b68aac70179890be6ab89210
---

diff --git a/includes/page/Article.php b/includes/page/Article.php
index f93f4f5d4b..e562d43f1c 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -986,6 +986,10 @@ class Article implements Page {
 		$query = $request->getValues();
 		unset( $query['rdfrom'] );
 		unset( $query['title'] );
+		if ( $this->getTitle()->isRedirect() ) {
+			// Prevent double redirects
+			$query['redirect'] = 'no';
+		}
 		$redirectTargetUrl = $this->getTitle()->getLinkURL( $query );
 
 		if ( isset( $this->mRedirectedFrom ) ) {