| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | * Expand templates and variables in the text, producing valid, static wikitext. |
| 455 | 455 | * Also removes comments. |
| 456 | 456 | */ |
| 457 | | - function preprocess( $text, Title $title, ParserOptions $options, $revid = null ) { |
| | 457 | + function preprocess( $text, $title, $options, $revid = null ) { |
| 458 | 458 | wfProfileIn( __METHOD__ ); |
| 459 | 459 | $this->startExternalParse( $title, $options, self::OT_PREPROCESS, true ); |
| 460 | 460 | if ( $revid !== null ) { |
| — | — | @@ -473,7 +473,7 @@ |
| 474 | 474 | * <noinclude>, <includeonly> etc. are parsed as for template transclusion, |
| 475 | 475 | * comments, templates, arguments, tags hooks and parser functions are untouched. |
| 476 | 476 | */ |
| 477 | | - public function getPreloadText( $text, Title $title, ParserOptions $options ) { |
| | 477 | + public function getPreloadText( $text, $title, $options ) { |
| 478 | 478 | # Parser (re)initialisation |
| 479 | 479 | $this->startExternalParse( $title, $options, self::OT_PLAIN, true ); |
| 480 | 480 | |
| — | — | @@ -4293,7 +4293,7 @@ |
| 4294 | 4294 | * Set up some variables which are usually set up in parse() |
| 4295 | 4295 | * so that an external function can call some class members with confidence |
| 4296 | 4296 | */ |
| 4297 | | - public function startExternalParse( Title $title = null, ParserOptions $options, $outputType, $clearState = true ) { |
| | 4297 | + public function startExternalParse( &$title, $options, $outputType, $clearState = true ) { |
| 4298 | 4298 | $this->setTitle( $title ); |
| 4299 | 4299 | $this->mOptions = $options; |
| 4300 | 4300 | $this->setOutputType( $outputType ); |
| — | — | @@ -5187,7 +5187,7 @@ |
| 5188 | 5188 | /** |
| 5189 | 5189 | * strip/replaceVariables/unstrip for preprocessor regression testing |
| 5190 | 5190 | */ |
| 5191 | | - function testSrvus( $text, $title, ParserOptions $options, $outputType = self::OT_HTML ) { |
| | 5191 | + function testSrvus( $text, $title, $options, $outputType = self::OT_HTML ) { |
| 5192 | 5192 | if ( !$title instanceof Title ) { |
| 5193 | 5193 | $title = Title::newFromText( $title ); |
| 5194 | 5194 | } |