| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -331,7 +331,11 @@ |
| 332 | 332 | $text = $this->internalParse( $text ); |
| 333 | 333 | // internalParse took care of the notitleconvert bit, so title conversion is here. |
| 334 | 334 | if ( $this->mDoTitleConvert && !$this->mTitle->isConversionTable()) { |
| 335 | | - $this->setTitle( Title::newFromText( $wgContLang->convert( $title ) ) ); |
| | 335 | + $converted = $wgContLang->convert( $title ); |
| | 336 | + if ( !$converted instanceOf Title ) { |
| | 337 | + $converted = Title::newFromText( $converted ); |
| | 338 | + } |
| | 339 | + $this->setTitle( $converted ); |
| 336 | 340 | } |
| 337 | 341 | |
| 338 | 342 | $text = $this->mStripState->unstripGeneral( $text ); |
| Index: trunk/phase3/includes/specials/SpecialFewestrevisions.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | if( !$nt ) { |
| 58 | 58 | return '<!-- bad title -->'; |
| 59 | 59 | } |
| 60 | | - |
| | 60 | + |
| 61 | 61 | $text = $wgContLang->convert( $nt->getPrefixedText() ); |
| 62 | 62 | |
| 63 | 63 | $plink = $skin->linkKnown( |
| Index: trunk/phase3/languages/LanguageConverter.php |
| — | — | @@ -514,13 +514,7 @@ |
| 515 | 515 | $marked = explode( $this->mMarkup['begin'], $text, 2 ); |
| 516 | 516 | $converted = ''; |
| 517 | 517 | |
| 518 | | - if ( $this->mDoContentConvert ) { |
| 519 | | - // Bug 19620: should convert a string immediately after a |
| 520 | | - // new rule added. |
| 521 | | - $converted .= $this->autoConvert( $marked[0], $plang ); |
| 522 | | - } else { |
| 523 | | - $converted .= $marked[0]; |
| 524 | | - } |
| | 518 | + $converted .= $this->autoConvert( $marked[0], $plang ); |
| 525 | 519 | |
| 526 | 520 | if ( array_key_exists( 1, $marked ) ) { |
| 527 | 521 | $crule = new ConverterRule( $marked[1], $this ); |