From 264652b1fd2757bacd92ff2baaef9e8576974529 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 26 May 2013 11:46:12 +0200 Subject: [PATCH] Reduce use of globals Or reduce the scope where they are available. Change-Id: Idce74bda8f64cc6be62b58b2624629408ca18d4b --- UniversalLanguageSelector.hooks.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index 3624ad2d..1085bd10 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -83,20 +83,22 @@ class UniversalLanguageSelectorHooks { * Hook: PersonalUrls */ static function addPersonalBarTrigger( array &$personal_urls, &$title ) { - global $wgLang, $wgUser, $wgULSPosition; + global $wgULSPosition; if ( $wgULSPosition !== 'personal' ) { return true; } - if ( !self::isToolbarEnabled( $wgUser ) ) { + $context = RequestContext::getMain(); + if ( !self::isToolbarEnabled( $context->getUser() ) ) { return true; } // The element id will be 'pt-uls' + $lang = $context->getLanguage(); $personal_urls = array( 'uls' => array( - 'text' => $wgLang->getLanguageName( $wgLang->getCode() ), + 'text' => $lang->getLanguageName( $lang->getCode() ), 'href' => '#', 'class' => 'uls-trigger', 'active' => true @@ -160,7 +162,8 @@ class UniversalLanguageSelectorHooks { * @return bool */ public static function getLanguage( $user, &$code, $context = null ) { - global $wgUser, $wgRequest, $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection; + global $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection; + if ( !self::isToolbarEnabled( $user ) ) { return true; } @@ -169,6 +172,8 @@ class UniversalLanguageSelectorHooks { * 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; }