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

Merge "Reduce use of globals"

Browse Source
This commit is contained in:
jenkins-bot
2013-05-26 11:07:01 +00:00
committed by Gerrit Code Review
parent 17c1ce60e5 264652b1fd
commit c57cab0403
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UniversalLanguageSelector.hooks.php
View File

@@ -84,20 +84,22 @@ class UniversalLanguageSelectorHooks {
* Hook: PersonalUrls * Hook: PersonalUrls
*/ */
static function addPersonalBarTrigger( array &$personal_urls, &$title ) { static function addPersonalBarTrigger( array &$personal_urls, &$title ) {
global $wgLang, $wgUser, $wgULSPosition; global $wgULSPosition;
if ( $wgULSPosition !== 'personal' ) { if ( $wgULSPosition !== 'personal' ) {
return true; return true;
} }
if ( !self::isToolbarEnabled( $wgUser ) ) { $context = RequestContext::getMain();
if ( !self::isToolbarEnabled( $context->getUser() ) ) {
return true; return true;
} }
// The element id will be 'pt-uls' // The element id will be 'pt-uls'
$lang = $context->getLanguage();
$personal_urls = array( $personal_urls = array(
'uls' => array( 'uls' => array(
'text' => $wgLang->getLanguageName( $wgLang->getCode() ), 'text' => $lang->getLanguageName( $lang->getCode() ),
'href' => '#', 'href' => '#',
'class' => 'uls-trigger', 'class' => 'uls-trigger',
'active' => true 'active' => true
@@ -161,7 +163,8 @@ class UniversalLanguageSelectorHooks {
* @return bool * @return bool
*/ */
public static function getLanguage( $user, &$code, $context = null ) { public static function getLanguage( $user, &$code, $context = null ) {
global $wgUser, $wgRequest, $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection; global $wgULSAnonCanChangeLanguage, $wgULSLanguageDetection;
if ( !self::isToolbarEnabled( $user ) ) { if ( !self::isToolbarEnabled( $user ) ) {
return true; return true;
} }
@@ -170,6 +173,8 @@ class UniversalLanguageSelectorHooks {
* name matches the current user name to detect if we are not * name matches the current user name to detect if we are not
* running in the primary request context. See bug 44010 */ * running in the primary request context. See bug 44010 */
if ( !$context instanceof RequestContext ) { if ( !$context instanceof RequestContext ) {
global $wgUser, $wgRequest;
if ( $wgUser->getName() !== $user->getName() ) { if ( $wgUser->getName() !== $user->getName() ) {
return true; return true;
} }