bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Small tweaks."

Browse Source
This commit is contained in:
Reedy
2012-09-29 17:54:08 +00:00
committed by Gerrit Code Review
parent da0a9e2b8f b2ff1cb8ce
commit 10edd7848e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UniversalLanguageSelector.hooks.php
View File

@@ -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 );