From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 31 Aug 2006 16:48:37 +0000 (+0000)
Subject: * (bug 7026) Fix action=raw&templates=expand
X-Git-Tag: 1.31.0-rc.0~55867
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=47d11d092d756f9127760de06498d9aafc856e03;p=lhc%2Fweb%2Fwiklou.git

* (bug 7026) Fix action=raw&templates=expand
http://bugzilla.wikimedia.org/attachment.cgi?id=2229&action=view
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d1b4810e50..43ee71a26b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -172,6 +172,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * [[Special:Disambiguations]] now shows pages in NS:0 that link to any pages that embed
   any of the templates listed at [[MediaWiki:Disambiguationspage]].
 * Fix formatting of titles on Special:Undelete
+* (bug 7026) Fix action=raw&templates=expand
+
 
 == Languages updated ==
 
diff --git a/includes/RawPage.php b/includes/RawPage.php
index f72c660dd1..f5e74e70e5 100644
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -189,14 +189,8 @@ class RawPage {
 			return '';
 		else
 			if ( $this->mExpandTemplates ) {
-				global $wgTitle;
-
-				$parser = new Parser();
-				$parser->Options( new ParserOptions() ); // We don't want this to be user-specific
-				$parser->Title( $wgTitle );
-				$parser->OutputType( OT_HTML );
-
-				return $parser->replaceVariables( $text );
+				global $wgParser;
+				return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() );
 			} else
 				return $text;
 	}