Revert r93688 per Platonides
authorSam Reed <reedy@users.mediawiki.org>
Tue, 2 Aug 2011 16:18:10 +0000 (16:18 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Tue, 2 Aug 2011 16:18:10 +0000 (16:18 +0000)
includes/parser/Preprocessor_DOM.php

index ecc5223..5b79876 100644 (file)
@@ -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__ );