From 857fa9458b7a7347b16b594cd07c7c3021144777 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Thu, 7 Jan 2010 05:00:19 +0000 Subject: [PATCH] follow-up r60763 and r58275. Parser tests now pass. --- includes/parser/Parser.php | 6 +++++- includes/specials/SpecialFewestrevisions.php | 2 +- languages/LanguageConverter.php | 8 +------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 5eb1841963..334021a118 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -331,7 +331,11 @@ class Parser $text = $this->internalParse( $text ); // internalParse took care of the notitleconvert bit, so title conversion is here. if ( $this->mDoTitleConvert && !$this->mTitle->isConversionTable()) { - $this->setTitle( Title::newFromText( $wgContLang->convert( $title ) ) ); + $converted = $wgContLang->convert( $title ); + if ( !$converted instanceOf Title ) { + $converted = Title::newFromText( $converted ); + } + $this->setTitle( $converted ); } $text = $this->mStripState->unstripGeneral( $text ); diff --git a/includes/specials/SpecialFewestrevisions.php b/includes/specials/SpecialFewestrevisions.php index 3de1c345df..65d76a6584 100644 --- a/includes/specials/SpecialFewestrevisions.php +++ b/includes/specials/SpecialFewestrevisions.php @@ -56,7 +56,7 @@ class FewestrevisionsPage extends QueryPage { if( !$nt ) { return ''; } - + $text = $wgContLang->convert( $nt->getPrefixedText() ); $plink = $skin->linkKnown( diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index ce4c76b3f5..3105ab42d0 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -514,13 +514,7 @@ class LanguageConverter { $marked = explode( $this->mMarkup['begin'], $text, 2 ); $converted = ''; - if ( $this->mDoContentConvert ) { - // Bug 19620: should convert a string immediately after a - // new rule added. - $converted .= $this->autoConvert( $marked[0], $plang ); - } else { - $converted .= $marked[0]; - } + $converted .= $this->autoConvert( $marked[0], $plang ); if ( array_key_exists( 1, $marked ) ) { $crule = new ConverterRule( $marked[1], $this ); -- 2.20.1