(bug 17570) $wgMaxRedirects is now correctly respected when following redirects ...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 06c34d3..3ee34d3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -195,6 +195,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17556) <link> parameters in Special:Contributions feeds (RSS and Atom)
   now point to the actual contributors' feed.
 * ForeignApiRepos now fetch MIME types, rather than trying to figure it locally
+* (bug 17570) $wgMaxRedirects is now correctly respected when following
+  redirects (was previously one more than $wgMaxRedirects)
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/Title.php b/includes/Title.php
index 37cd0b9..94ad845 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -339,7 +339,7 @@ class Title {
                // recursive check to follow double redirects
                $recurse = $wgMaxRedirects;
                $titles = array( $title );
-               while( --$recurse >= 0 ) {
+               while( --$recurse > 0 ) {
                        if( $title->isRedirect() ) {
                                $article = new Article( $title, 0 );
                                $newtitle = $article->getRedirectTarget();