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

[lhc/web/wiklou.git] / includes / Skin.php

diff --git a/includes/Skin.php b/includes/Skin.php
index 5d73f5b..1e3a9fb 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -352,7 +352,7 @@ class Skin extends Linker {
         */
        static function makeGlobalVariablesScript( $data ) {
                global $wgScript, $wgTitle, $wgStylePath, $wgUser;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang, $wgVariant;
                global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
                global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
                global $wgUseAjax, $wgAjaxWatch;
@@ -394,6 +394,7 @@ class Skin extends Linker {
                        'wgIsArticle' => $wgOut->isArticle(),
                        'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
                        'wgUserGroups' => $wgUser->isAnon() ? NULL : $wgUser->getEffectiveGroups(),
+                       'wgUserVariant' => $wgVariant->getCode(),
                        'wgUserLanguage' => $wgLang->getCode(),
                        'wgContentLanguage' => $wgContLang->getCode(),
                        'wgBreakFrames' => $wgBreakFrames,
@@ -404,6 +405,9 @@ class Skin extends Linker {
                        'wgSeparatorTransformTable' => $compactSeparatorTransTable,
                        'wgDigitTransformTable' => $compactDigitTransTable,
                );
+               if ( !( $wgContLang->hasVariants() ) ) {
+                       unset( $vars['wgUserVariant'] );
+               }
                
                if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
                        $vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
@@ -1672,7 +1676,7 @@ END;
                } else {
                        return $this->makeKnownLinkObj(
                                SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
-                               wfMsg( 'recentchangeslinked' ) );
+                               wfMsg( 'recentchangeslinked-toolbox' ) );
                }
        }