From 7cbaf20937401d8ce0921007438d22da7b2847f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Tue, 28 Aug 2012 07:51:54 +0000 Subject: [PATCH] Fix Icfa371d2: some workaround to avoid unstub exception and typofix 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 --- UniversalLanguageSelector.hooks.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index 5bf866b4..c3570267 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -69,15 +69,16 @@ class UniversalLanguageSelectorHooks { * @return bool */ public static function getLanguage( $user, &$code ) { - global $wgRequest, $wgLanguageCode; + global $wgRequest; if ( $wgRequest->getVal( 'uselang' ) ) { // uselang can be used for temporary override of language preference return true; } $setlang = $wgRequest->getVal( 'setlang' ); $setlang = RequestContext::sanitizeLangCode( $setlang ); - $validMWLanguages = Language::fetchLanguageNames( $wgLanguageCode, null, 'mwfile' ); - if ( !array_key_exists( $setlang, $validLanguages ) ) { + // TODO: replace with core method once one exists + $supported = Language::fetchLanguageNames( null, 'mwfile' ); + if ( !array_key_exists( $setlang, $supported ) ) { wfDebug( "Invalid user language code\n" ); return true; } @@ -106,7 +107,7 @@ class UniversalLanguageSelectorHooks { */ public static function addConfig( &$vars ) { global $wgContLang; - $vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), null, 'mwfile' ); + $vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), 'mwfile' ); return true; } }