From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 2 Aug 2011 16:18:10 +0000 (+0000)
Subject: Revert r93688 per Platonides
X-Git-Tag: 1.31.0-rc.0~28483
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=801a05afc22c7a6b96e97d2eafafced7898feb4a;p=lhc%2Fweb%2Fwiklou.git

Revert r93688 per Platonides
---

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