From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 23 Mar 2004 10:16:32 +0000 (+0000)
Subject: allowing redirects in inclusions
X-Git-Tag: 1.3.0beta1~735
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=e7b00f8fee93441a68f081183a3c6fd2ccfbca85;p=lhc%2Fweb%2Fwiklou.git

allowing redirects in inclusions
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 47c6598727..a1fb01f988 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1223,12 +1223,11 @@ class Parser
 					$this->mIncludeCount[$dbk] = 0;
 				}
 				if ( ++$this->mIncludeCount[$dbk] <= MAX_INCLUDE_REPEAT ) {
-					$row = wfGetArray( "cur", array("cur_text"), array( 
-					  "cur_namespace" => $title->getNamespace(),
-					  "cur_title" => $title->getDBkey() ), $fname );
-					if ( $row !== false ) {
+					$article = new Article( $title );
+					$articleContent = $article->getContentWithoutUsingSoManyDamnGlobals();
+					if ( $articleContent !== false ) {
 						$found = true;
-						$text = $row->cur_text;
+						$text = $articleContent;
 						
 						# Escaping and link table handling
 						# Not required for preSaveTransform()