Small tweaks.
* Assign $languageToSave earlier; more efficient. * Double quotes to single quotes. * Whitespace update. Change-Id: I7028ac3ce5cbbe3611f33290331d0a014a073bf5
This commit is contained in:
@@ -19,7 +19,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
class UniversalLanguageSelectorHooks {
|
class UniversalLanguageSelectorHooks {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BeforePageDisplay hook handler.
|
* BeforePageDisplay hook handler.
|
||||||
* @param $out OutputPage
|
* @param $out OutputPage
|
||||||
@@ -106,7 +105,7 @@ class UniversalLanguageSelectorHooks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
wfProfileOut( __METHOD__ );
|
wfProfileOut( __METHOD__ );
|
||||||
return "";
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -117,14 +116,15 @@ class UniversalLanguageSelectorHooks {
|
|||||||
*/
|
*/
|
||||||
public static function getLanguage( $user, &$code ) {
|
public static function getLanguage( $user, &$code ) {
|
||||||
global $wgRequest, $wgULSLanguageDetection;
|
global $wgRequest, $wgULSLanguageDetection;
|
||||||
if ( $wgRequest->getVal( 'uselang' ) && !$wgRequest->getVal( 'setlang' ) ) {
|
|
||||||
|
$languageToSave = $wgRequest->getVal( 'setlang' );
|
||||||
|
if ( $wgRequest->getVal( 'uselang' ) && !$languageToSave ) {
|
||||||
// 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
|
// when setlang is not provided
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$languageToUse = null;
|
$languageToUse = null;
|
||||||
$languageToSave = $wgRequest->getVal( 'setlang' );
|
|
||||||
if ( self::isSupportedLanguage( $languageToSave ) ) {
|
if ( self::isSupportedLanguage( $languageToSave ) ) {
|
||||||
if ( $user->isAnon() ) {
|
if ( $user->isAnon() ) {
|
||||||
$wgRequest->response()->setcookie( 'language', $languageToSave );
|
$wgRequest->response()->setcookie( 'language', $languageToSave );
|
||||||
|
|||||||
Reference in New Issue
Block a user