| Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
| — | — | @@ -882,11 +882,11 @@ |
| 883 | 883 | return $root; |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | | - if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->mMaxPPNodeCount ) |
| | 886 | + if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->getMaxPPNodeCount() ) |
| 887 | 887 | { |
| 888 | 888 | return '<span class="error">Node-count limit exceeded</span>'; |
| 889 | 889 | } |
| 890 | | - if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) { |
| | 890 | + if ( $expansionDepth > $this->parser->mOptions->getMaxPPExpandDepth() ) { |
| 891 | 891 | return '<span class="error">Expansion depth limit exceeded</span>'; |
| 892 | 892 | } |
| 893 | 893 | ++$expansionDepth; |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -369,7 +369,7 @@ |
| 370 | 370 | |
| 371 | 371 | $text = Sanitizer::normalizeCharReferences( $text ); |
| 372 | 372 | |
| 373 | | - if ( ( $wgUseTidy && $this->mOptions->mTidy ) || $wgAlwaysUseTidy ) { |
| | 373 | + if ( ( $wgUseTidy && $this->mOptions->getTidy() ) || $wgAlwaysUseTidy ) { |
| 374 | 374 | $text = MWTidy::tidy( $text ); |
| 375 | 375 | } else { |
| 376 | 376 | # attempt to sanitize at least some nesting problems |
| — | — | @@ -411,7 +411,7 @@ |
| 412 | 412 | $PFreport = "Expensive parser function count: {$this->mExpensiveFunctionCount}/$wgExpensiveParserFunctionLimit\n"; |
| 413 | 413 | $limitReport = |
| 414 | 414 | "NewPP limit report\n" . |
| 415 | | - "Preprocessor node count: {$this->mPPNodeCount}/{$this->mOptions->mMaxPPNodeCount}\n" . |
| | 415 | + "Preprocessor node count: {$this->mPPNodeCount}/{$this->mOptions->getMaxPPNodeCount()}\n" . |
| 416 | 416 | "Post-expand include size: {$this->mIncludeSizes['post-expand']}/$max bytes\n" . |
| 417 | 417 | "Template argument size: {$this->mIncludeSizes['arg']}/$max bytes\n". |
| 418 | 418 | $PFreport; |
| Index: trunk/phase3/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -901,12 +901,12 @@ |
| 902 | 902 | return $root; |
| 903 | 903 | } |
| 904 | 904 | |
| 905 | | - if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->mMaxPPNodeCount ) |
| | 905 | + if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->getMaxPPNodeCount() ) |
| 906 | 906 | { |
| 907 | 907 | return '<span class="error">Node-count limit exceeded</span>'; |
| 908 | 908 | } |
| 909 | 909 | |
| 910 | | - if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) { |
| | 910 | + if ( $expansionDepth > $this->parser->mOptions->getMaxPPExpandDepth() ) { |
| 911 | 911 | return '<span class="error">Expansion depth limit exceeded</span>'; |
| 912 | 912 | } |
| 913 | 913 | wfProfileIn( __METHOD__ ); |
| Index: trunk/phase3/includes/parser/ParserOptions.php |
| — | — | @@ -50,6 +50,7 @@ |
| 51 | 51 | function getTargetLanguage() { return $this->mTargetLanguage; } |
| 52 | 52 | function getMaxIncludeSize() { return $this->mMaxIncludeSize; } |
| 53 | 53 | function getMaxPPNodeCount() { return $this->mMaxPPNodeCount; } |
| | 54 | + function getMaxPPExpandDepth() { return $this->mMaxPPExpandDepth; } |
| 54 | 55 | function getMaxTemplateDepth() { return $this->mMaxTemplateDepth; } |
| 55 | 56 | function getRemoveComments() { return $this->mRemoveComments; } |
| 56 | 57 | function getTemplateCallback() { return $this->mTemplateCallback; } |