From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 29 Sep 2011 17:54:19 +0000 (+0000)
Subject: FU r98421: forgot to move mParserOptions field
X-Git-Tag: 1.31.0-rc.0~27370
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=f9075cff41ee809fc116ef61c1298460d40fd3e3;p=lhc%2Fweb%2Fwiklou.git

FU r98421: forgot to move mParserOptions field
---

diff --git a/includes/Article.php b/includes/Article.php
index 95c476fc13..afcdbd7b2a 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -32,6 +32,12 @@ class Article extends Page {
 	 */
 	protected $mPage;
 
+	/**
+	 * @protected
+	 * @var ParserOptions: ParserOptions object for $wgUser articles
+	 */
+	public $mParserOptions;
+
 	var $mContent;                    // !<
 	var $mContentLoaded = false;      // !<
 	var $mOldId;                      // !<
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 11658c0691..1c869484f5 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -33,12 +33,6 @@ class WikiPage extends Page {
 	public $mTouched = '19700101000000'; // !< String
 	/**@}}*/
 
-	/**
-	 * @protected
-	 * @var ParserOptions: ParserOptions object for $wgUser articles
-	 */
-	public $mParserOptions;
-
 	/**
 	 * Constructor and clear the article
 	 * @param $title Title Reference to a Title object.