From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 6 Mar 2012 11:11:01 +0000 (+0000)
Subject: Partial revert of r97849: the wgUserVariant variable is useful and used even on speci... 
X-Git-Tag: 1.31.0-rc.0~24366
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=f6083ebd09e4829d9c89aa63c5b6b7390ca2a3c3;p=lhc%2Fweb%2Fwiklou.git

Partial revert of r97849: the wgUserVariant variable is useful and used even on special pages, removing it breaks b/c
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6c6c06b529..6c76ae1c29 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2830,7 +2830,7 @@ $templates
 	 * @return array
 	 */
 	public function getJSVars() {
-		global $wgUseAjax, $wgEnableMWSuggest;
+		global $wgUseAjax, $wgEnableMWSuggest, $wgContLang;
 
 		$latestRevID = 0;
 		$pageID = 0;
@@ -2882,8 +2882,8 @@ $templates
 			'wgSeparatorTransformTable' => $compactSeparatorTransTable,
 			'wgDigitTransformTable' => $compactDigitTransTable,
 		);
-		if ( $lang->hasVariants() ) {
-			$vars['wgUserVariant'] = $lang->getPreferredVariant();
+		if ( $wgContLang->hasVariants() ) {
+			$vars['wgUserVariant'] = $wgContLang->getPreferredVariant();
  		}
 		foreach ( $title->getRestrictionTypes() as $type ) {
 			$vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type );