follow-up r60763 and r58275. Parser tests now pass.

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 5eb1841..334021a 100644 (file)
--- 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 3de1c34..65d76a6 100644 (file)
--- a/includes/specials/SpecialFewestrevisions.php
+++ b/includes/specials/SpecialFewestrevisions.php
@@ -56,7 +56,7 @@ class FewestrevisionsPage extends QueryPage {
                if( !$nt ) {
                        return '<!-- bad title -->';
                }
-               
+
                $text = $wgContLang->convert( $nt->getPrefixedText() );
 
                $plink = $skin->linkKnown(

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ce4c76b..3105ab4 100644 (file)
--- 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 );