From 648bfbabc0911f853fe163ba80d7aefbecf3f341 Mon Sep 17 00:00:00 2001
From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Sat, 30 May 2009 19:49:51 +0000
Subject: [PATCH] * (bug 10837) Introducing the StubUserVariant class to
 determine the variant variable instead of using this to overrules the user
 language preference.

---
 RELEASE-NOTES           |  4 ++++
 includes/Setup.php      |  1 +
 includes/Skin.php       |  6 +++++-
 includes/StubObject.php | 41 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 13596a579d..3422caa185 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,6 +38,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Subpages are now enabled in the MediaWiki namespace by default.  This is
   mainly a cosmetic change, and does not in any way affect the MessageCache,
   which was already effectively treating the namespace as if it had subpages.
+* (bug 10837) $wgVariant is a user variant selected in the user's preferences 
+  if the $wgContLang does not have variant, then the $wgLang is used instead.
 
 === New features in 1.16 ===
 
@@ -174,6 +176,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   uploading/moving is disabled for registered users as well (e.g. only sysops)
 * (bug 18943) Handle invalid titles gracefully at Special:Mostlinked
 * (bug 8873) Enable variant conversion in text on 'alt' and 'title' attributes
+* (bug 10837) Introducing the StubUserVariant class to determine the variant 
+  variable instead of using this to overrules the user language preference.
 
 == API changes in 1.16 ==
 
diff --git a/includes/Setup.php b/includes/Setup.php
index 6df6ac3eef..8c2a5a3f0e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -269,6 +269,7 @@ $wgRequest->interpolateTitle();
 
 $wgUser = new StubUser;
 $wgLang = new StubUserLang;
+$wgVariant = new StubUserVariant;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
 
diff --git a/includes/Skin.php b/includes/Skin.php
index b03c6c7965..4ca215566d 100644
--- 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();
diff --git a/includes/StubObject.php b/includes/StubObject.php
index f1847a39ee..e18537e054 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -145,6 +145,45 @@ class StubUserLang extends StubObject {
 		global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
 		$code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
 
+		# Validate $code
+		if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
+			wfDebug( "Invalid user language code\n" );
+			$code = $wgContLanguageCode;
+		}
+
+		if( $code === $wgContLanguageCode ) {
+			return $wgContLang;
+		} else {
+			$obj = Language::factory( $code );
+			return $obj;
+		}
+	}
+}
+
+/**
+ * Stub object for the user variant. It depends of the user preferences and
+ * "variant" parameter that can be passed to index.php. This object have to be
+ * in $wgVariant global.
+ */
+class StubUserVariant extends StubObject {
+
+	function __construct() {
+		parent::__construct( 'wgVariant' );
+	}
+
+	function __call( $name, $args ) {
+		return $this->_call( $name, $args );
+	}
+
+	function _newObject() {
+		global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
+
+		if( $wgContLang->hasVariants() ) {
+			$code = $wgRequest->getVal( 'variant', $wgUser->getOption( 'variant' ) );
+		} else {
+			$code = $wgRequest->getVal( 'variant', $wgUser->getOption( 'language' ) );
+		}
+
 		// if variant is explicitely selected, use it instead the one from wgUser
 		// see bug #7605
 		if( $wgContLang->hasVariants() && in_array($code, $wgContLang->getVariants()) ){
@@ -155,7 +194,7 @@ class StubUserLang extends StubObject {
 
 		# Validate $code
 		if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
-			wfDebug( "Invalid user language code\n" );
+			wfDebug( "Invalid user variant code\n" );
 			$code = $wgContLanguageCode;
 		}
 
-- 
2.20.1