From 0f2f7f8b62e4549f43ff090796ea7f729b659f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Tue, 28 Aug 2012 12:12:15 +0000
Subject: [PATCH] Fix bug: language stuck in English

Change-Id: Ice51d517f5381197f9c0f72844961e74b021e3dc
---
 UniversalLanguageSelector.hooks.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 9fe71d95..00737cd7 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -74,15 +74,16 @@ class UniversalLanguageSelectorHooks {
 			// uselang can be used for temporary override of language preference
 			return true;
 		}
+
 		$setlang = $wgRequest->getVal( 'setlang' );
-		$setlang = RequestContext::sanitizeLangCode( $setlang );
-		// TODO: replace with core method once one exists
-		$supported = Language::fetchLanguageNames( null, 'mwfile' );
-		if ( !array_key_exists( $setlang, $supported ) ) {
-			wfDebug( "Invalid user language code\n" );
-			return true;
-		}
 		if ( $setlang ) {
+			// TODO: replace with core method once one exists
+			$supported = Language::fetchLanguageNames( null, 'mwfile' );
+			if ( !isset( $supported[$setlang] ) ) {
+				wfDebug( "Invalid user language code\n" );
+				return true;
+			}
+
 			if ( $user->isAnon() ) {
 				$wgRequest->response()->setcookie( 'language', $setlang );
 			} else {