From 5f1f15c357b71d20eb8cfabf1357a240b67660d4 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 1 Jun 2010 15:19:19 +0000
Subject: [PATCH] * (bug 23740) Article::doRedirect() now use $extraQuery
 parameter correctly if the $noRedir parameter is set to true

---
 RELEASE-NOTES        | 2 ++
 includes/Article.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 872486d3c1..c69682da14 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -181,6 +181,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 22967) Make edit summary length cut-off behave correctly for 
   multibyte characters.
 * (bug 8689) Long numeric lines no longer  kill the parser.
+* (bug 23740) Article::doRedirect() now use $extraQuery parameter correctly if
+  the $noRedir parameter is set to true
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/includes/Article.php b/includes/Article.php
index 778c051b35..56d87c2d8e 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2361,7 +2361,7 @@ class Article {
 		if ( $noRedir ) {
 			$query = 'redirect=no';
 			if ( $extraQuery )
-				$query .= "&$query";
+				$query .= "&$extraQuery";
 		} else {
 			$query = $extraQuery;
 		}
-- 
2.20.1