follow up r69134. Change all of convertLinkToAllVariants()'s callers to call autoConv...

diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index eccbeb9..f6a6610 100644 (file)
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -330,7 +330,7 @@ class LinkHolderArray {
                }
                
                // Now do the conversion and explode string to text of titles
-               $titlesAllVariants = $wgContLang->convertLinkToAllVariants( $titlesToBeConverted );
+               $titlesAllVariants = $wgContLang->autoConvertToAllVariants( $titlesToBeConverted );
                $allVariantsName = array_keys( $titlesAllVariants );
                foreach ( $titlesAllVariants as &$titlesVariant ) {
                        $titlesVariant = explode( "\0", $titlesVariant );
@@ -354,7 +354,7 @@ class LinkHolderArray {
                $categoryMap = array(); // maps $category_variant => $category (dbkeys)
                $varCategories = array(); // category replacements oldDBkey => newDBkey
                foreach( $output->getCategoryLinks() as $category ){
-                       $variants = $wgContLang->convertLinkToAllVariants( $category );
+                       $variants = $wgContLang->autoConvertToAllVariants( $category );
                        foreach($variants as $variant){
                                if($variant != $category){
                                        $variantTitle = Title::newFromDBkey( Title::makeName(NS_CATEGORY,$variant) );

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index ca949ed..388cef7 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1686,7 +1686,7 @@ class Parser {
                }
 
                if ( $wgContLang->hasVariants() ) {
-                       $selflink = $wgContLang->convertLinkToAllVariants( $this->mTitle->getPrefixedText() );
+                       $selflink = $wgContLang->autoConvertToAllVariants( $this->mTitle->getPrefixedText() );
                } else {
                        $selflink = array( $this->mTitle->getPrefixedText() );
                }

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 3624f9e..188512c 100644 (file)
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -108,7 +108,7 @@ class SearchEngine {
                $allSearchTerms = array( $searchterm );
 
                if ( $wgContLang->hasVariants() ) {
-                       $allSearchTerms = array_merge( $allSearchTerms, $wgContLang->convertLinkToAllVariants( $searchterm ) );
+                       $allSearchTerms = array_merge( $allSearchTerms, $wgContLang->autoConvertToAllVariants( $searchterm ) );
                }
 
                if ( !wfRunHooks( 'SearchGetNearMatchBefore', array( $allSearchTerms, &$titleResult ) ) ) {

diff --git a/languages/Language.php b/languages/Language.php
index cb0af4b..71793e2 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -39,7 +39,7 @@ if ( function_exists( 'mb_strtoupper' ) ) {
 class FakeConverter {
        var $mLang;
        function FakeConverter( $langobj ) { $this->mLang = $langobj; }
-       function autoConvertToAllVariants( $text ) { return $text; }
+       function autoConvertToAllVariants( $text ) { return array( $this->mLang->getCode() => $text ); }
        function convert( $t ) { return $t; }
        function convertTitle( $t ) { return $t->getPrefixedText(); }
        function getVariants() { return array( $this->mLang->getCode() ); }
@@ -50,7 +50,7 @@ class FakeConverter {
        function getParsedTitle() { return ''; }
        function markNoConversion( $text, $noParse = false ) { return $text; }
        function convertCategoryKey( $key ) { return $key; }
-       function convertLinkToAllVariants( $text ) { return array( $this->mLang->getCode() => $text ); }
+       function convertLinkToAllVariants( $text ) { return autoConvertToAllVariants( $text ); }
        function armourMath( $text ) { return $text; }
 }