Fix Bug 39733 - Setlang should clear uselang

When setlang and uselang given, setlang take precedence

Change-Id: I749647985932fe52c3c0d417678d98cd017f1f4d
This commit is contained in:
Santhosh Thottingal
2012-09-03 11:49:29 +05:30
parent dc163127e3
commit c3201d95a7

View File

@@ -104,8 +104,9 @@ class UniversalLanguageSelectorHooks {
*/ */
public static function getLanguage( $user, &$code ) { public static function getLanguage( $user, &$code ) {
global $wgRequest, $wgULSLanguageDetection; global $wgRequest, $wgULSLanguageDetection;
if ( $wgRequest->getVal( 'uselang' ) ) { if ( $wgRequest->getVal( 'uselang' ) && !$wgRequest->getVal( 'setlang' ) ) {
// uselang can be used for temporary override of language preference // uselang can be used for temporary override of language preference
// when setlang is not provided
return true; return true;
} }