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

Merge "Remove workaround code only needed for MW 1.20 and lower"

Browse Source
This commit is contained in:
jenkins-bot
2014-09-29 14:26:10 +00:00
committed by Gerrit Code Review
parent d98df551f3 f1d969efdb
commit 6860d7c49f
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
UniversalLanguageSelector.hooks.php
View File

@@ -218,31 +218,17 @@ class UniversalLanguageSelectorHooks {
* Hook to UserGetLanguageObject * Hook to UserGetLanguageObject
* @param User $user * @param User $user
* @param string $code * @param string $code
* @param RequestContext $context Optional RequestContext * @param RequestContext $context
* @return bool * @return bool
*/ */
public static function getLanguage( $user, &$code, $context = null ) { public static function getLanguage( User $user, &$code, RequestContext $context ) {
global $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection; global $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection;
if ( !self::isToolbarEnabled( $user ) ) { if ( !self::isToolbarEnabled( $user ) ) {
return true; return true;
} }
/* Before $request is passed to this, check if the given user
* name matches the current user name to detect if we are not
* running in the primary request context. See bug 44010 */
if ( !$context instanceof RequestContext ) {
global $wgUser, $wgRequest;
if ( $wgUser->getName() !== $user->getName() ) {
return true;
}
// Should be safe to use the global request now
$request = $wgRequest;
} else {
$request = $context->getRequest(); $request = $context->getRequest();
}
$languageToSave = $request->getVal( 'setlang' ); $languageToSave = $request->getVal( 'setlang' );
if ( $request->getVal( 'uselang' ) && !$languageToSave ) { if ( $request->getVal( 'uselang' ) && !$languageToSave ) {