summaryrefslogtreecommitdiff
path: root/includes/resourceloader/ResourceLoaderUserGroupsModule.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /includes/resourceloader/ResourceLoaderUserGroupsModule.php
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/resourceloader/ResourceLoaderUserGroupsModule.php')
-rw-r--r--includes/resourceloader/ResourceLoaderUserGroupsModule.php39
1 files changed, 26 insertions, 13 deletions
diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 733dfa04..1316f423 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Resource loader module for user customizations.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -31,21 +33,32 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
* @return array
*/
protected function getPages( ResourceLoaderContext $context ) {
- if ( $context->getUser() ) {
- $user = User::newFromName( $context->getUser() );
- if ( $user instanceof User ) {
- $pages = array();
- foreach( $user->getEffectiveGroups() as $group ) {
- if ( in_array( $group, array( '*', 'user' ) ) ) {
- continue;
- }
- $pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' );
- $pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' );
- }
- return $pages;
+ global $wgUser;
+
+ $userName = $context->getUser();
+ if ( $userName === null ) {
+ return array();
+ }
+
+ // Use $wgUser is possible; allows to skip a lot of code
+ if ( is_object( $wgUser ) && $wgUser->getName() == $userName ) {
+ $user = $wgUser;
+ } else {
+ $user = User::newFromName( $userName );
+ if ( !$user instanceof User ) {
+ return array();
+ }
+ }
+
+ $pages = array();
+ foreach( $user->getEffectiveGroups() as $group ) {
+ if ( in_array( $group, array( '*', 'user' ) ) ) {
+ continue;
}
+ $pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' );
+ $pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' );
}
- return array();
+ return $pages;
}
/* Methods */