Revert r51128, and its follow-up revisions r51129, r51130, r51390.

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index dbdde9c..57af7bc 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -425,14 +425,7 @@ class LanguageConverter {
         * @public
         */
        function parserConvert( $text, &$parser ) {
-               global $wgUser, $wgEnableVariants;
-
-               /* disable entire conversion engine if the user had been disabled it */
-               $variantConv = $wgUser->getOption( 'variantconversion' );
-               if ( ( $wgEnableVariants == true ) && ( $variantConv === 0 ) ) { 
-                       $wgEnableVariants = false;
-               }
-
+               global $wgDisableLangConversion;
                /* don't do anything if this is the conversion table */
                if ( $parser->getTitle()->getNamespace() == NS_MEDIAWIKI &&
                                 strpos($parser->mTitle->getText(), "Conversiontable") !== false ) 
@@ -440,7 +433,7 @@ class LanguageConverter {
                        return $text;
                }
 
-               if ( !$wgEnableVariants )
+               if ( $wgDisableLangConversion )
                        return $text;
 
                $text = $this->convert( $text );
@@ -579,11 +572,11 @@ class LanguageConverter {
         * @public
         */
        function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
-               global $wgEnableVariants, $wgDisableTitleConversion, $wgRequest, $wgUser;
+               global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest, $wgUser;
                $isredir = $wgRequest->getText( 'redirect', 'yes' );
                $action = $wgRequest->getText( 'action' );
                $linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
-               $disableLinkConversion = !$wgEnableVariants || $wgDisableTitleConversion;
+               $disableLinkConversion = $wgDisableLangConversion || $wgDisableTitleConversion;
                $linkBatch = new LinkBatch();
 
                $ns=NS_MAIN;