Move the circular reference check to *after* redirect resolution, to avoid infinite...

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 02f29cf..0f57d57 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2855,12 +2855,6 @@ class Parser
                                if($wgContLang->hasVariants() && $title->getArticleID() == 0){
                                        $wgContLang->findVariantLink( $part1, $title, true );
                                }
-                               # Do infinite loop check
-                               if ( !$frame->loopCheck( $title ) ) {
-                                       $found = true;
-                                       $text = '<span class="error">' . wfMsgForContent( 'parser-template-loop-warning', $titleText ) . '</span>';
-                                       wfDebug( __METHOD__.": template loop broken at '$titleText'\n" );
-                               }
                                # Do recursion depth check
                                $limit = $this->mOptions->getMaxTemplateDepth();
                                if ( $frame->depth >= $limit ) {
@@ -2910,6 +2904,14 @@ class Parser
                                }
                                $found = true;
                        }
+
+                       # Do infinite loop check
+                       # This has to be done after redirect resolution to avoid infinite loops via redirects
+                       if ( !$frame->loopCheck( $title ) ) {
+                               $found = true;
+                               $text = '<span class="error">' . wfMsgForContent( 'parser-template-loop-warning', $titleText ) . '</span>';
+                               wfDebug( __METHOD__.": template loop broken at '$titleText'\n" );
+                       }
                        wfProfileOut( __METHOD__ . '-loadtpl' );
                }