* (bug 23740) Article::doRedirect() now use $extraQuery parameter correctly if the...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 872486d..c69682d 100644 (file)
--- 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 778c051..56d87c2 100644 (file)
--- 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;
                }