From c3201d95a71c2cb8183f266a108e6ecd934e4fa9 Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Mon, 3 Sep 2012 11:49:29 +0530
Subject: [PATCH] Fix Bug 39733 - Setlang should clear uselang

When setlang and uselang given, setlang take precedence

Change-Id: I749647985932fe52c3c0d417678d98cd017f1f4d
---
 UniversalLanguageSelector.hooks.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index c9441bb2..0b9df72b 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -104,8 +104,9 @@ class UniversalLanguageSelectorHooks {
 	 */
 	public static function getLanguage( $user, &$code ) {
 		global $wgRequest, $wgULSLanguageDetection;
-		if ( $wgRequest->getVal( 'uselang' ) ) {
+		if ( $wgRequest->getVal( 'uselang' ) && !$wgRequest->getVal( 'setlang' ) ) {
 			// uselang can be used for temporary override of language preference
+			// when setlang is not provided
 			return true;
 		}