From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 1 Aug 2011 23:39:34 +0000 (+0000)
Subject: Commit Preprocessor_DOM live hacks
X-Git-Tag: 1.31.0-rc.0~28504
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=47ddc178a101846c1a79423b4129b5cc49224718;p=lhc%2Fweb%2Fwiklou.git

Commit Preprocessor_DOM live hacks
---

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 48c234575f..ecc522348e 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -956,12 +956,12 @@ class PPFrame_DOM implements PPFrame {
 			return $root;
 		}
 
-		if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->getMaxPPNodeCount() )
+		if ( is_object( $this->parser->mOptions ) && ++$this->parser->mPPNodeCount > $this->parser->mOptions->getMaxPPNodeCount() )
 		{
 			return '<span class="error">Node-count limit exceeded</span>';
 		}
 
-		if ( $expansionDepth > $this->parser->mOptions->getMaxPPExpandDepth() ) {
+		if ( is_object( $this->parser->mOptions ) && $expansionDepth > $this->parser->mOptions->getMaxPPExpandDepth() ) {
 			return '<span class="error">Expansion depth limit exceeded</span>';
 		}
 		wfProfileIn( __METHOD__ );