From 39292da1a67e63797f09973af26e0af246089d0c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Sun, 28 Sep 2014 17:26:27 +0200
Subject: [PATCH] Article: Handle double redirects in data for
 mediawiki.action.view.redirect

Bug: 71002
Change-Id: Id7dd37a4865635d3b68aac70179890be6ab89210
---
 includes/page/Article.php | 4 ++++
 1 file changed, 4 insertions(+)

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 ) ) {
-- 
2.20.1