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

Fix Icfa371d2: some workaround to avoid unstub exception and typofix

Browse Source 
Exception from line 124 of /www/w/includes/StubObject.php: Unstub loop detected on call of $wgLang->getCode
from Message::inLanguage

[28-Aug-2012 07:45:20] PHP Notice:  Undefined variable: validLanguages in /www/w/extensions/UniversalLanguageSelector/UniversalLanguageSelector.hooks.php on line 80
[28-Aug-2012 07:45:20] PHP Warning:  array_key_exists() expects parameter 2 to be array, null given in /www/w/extensions/UniversalLanguageSelector/UniversalLanguageSelector.hooks.php on line 80

Change-Id: I6ab332ce344c753a8ea5894fd9c45721a5835909
This commit is contained in:
Niklas Laxström
2012-08-28 07:51:54 +00:00
parent 7a5f3dd91d
commit 7cbaf20937
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UniversalLanguageSelector.hooks.php
View File

@@ -69,15 +69,16 @@ class UniversalLanguageSelectorHooks {
* @return bool * @return bool
*/ */
public static function getLanguage( $user, &$code ) { public static function getLanguage( $user, &$code ) {
global $wgRequest, $wgLanguageCode; global $wgRequest;
if ( $wgRequest->getVal( 'uselang' ) ) { if ( $wgRequest->getVal( 'uselang' ) ) {
// uselang can be used for temporary override of language preference // uselang can be used for temporary override of language preference
return true; return true;
} }
$setlang = $wgRequest->getVal( 'setlang' ); $setlang = $wgRequest->getVal( 'setlang' );
$setlang = RequestContext::sanitizeLangCode( $setlang ); $setlang = RequestContext::sanitizeLangCode( $setlang );
$validMWLanguages = Language::fetchLanguageNames( $wgLanguageCode, null, 'mwfile' ); // TODO: replace with core method once one exists
if ( !array_key_exists( $setlang, $validLanguages ) ) { $supported = Language::fetchLanguageNames( null, 'mwfile' );
if ( !array_key_exists( $setlang, $supported ) ) {
wfDebug( "Invalid user language code\n" ); wfDebug( "Invalid user language code\n" );
return true; return true;
} }
@@ -106,7 +107,7 @@ class UniversalLanguageSelectorHooks {
*/ */
public static function addConfig( &$vars ) { public static function addConfig( &$vars ) {
global $wgContLang; global $wgContLang;
$vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), null, 'mwfile' ); $vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), 'mwfile' );
return true; return true;
} }
} }