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 f93f4f5..e562d43 100644 (file)
--- 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 ) ) {