X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderUserGroupsModule.php;h=e2a8e410c05365acb223d559fc3fa28714db5f91;hb=a85d1b9d0cd7f02111d3a647d5b91e3b1f334563;hp=7cf194206e93b1e812ea46384c93034d503ba21f;hpb=18926a3e2a5d166d590a9cfb75a01840e7562cf3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 7cf194206e..e2a8e410c0 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Resource loader module for user customizations.
+ * ResourceLoader 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
@@ -25,59 +25,43 @@
  */
 class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 
-	/* Protected Members */
-
 	protected $origin = self::ORIGIN_USER_SITEWIDE;
-	protected $targets = array( 'desktop', 'mobile' );
-
-	/* Protected Methods */
+	protected $targets = [ 'desktop', 'mobile' ];
 
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return array
 	 */
 	protected function getPages( ResourceLoaderContext $context ) {
-		global $wgUser;
-
-		$userName = $context->getUser();
-		if ( $userName === null ) {
-			return array();
-		}
-
 		$useSiteJs = $this->getConfig()->get( 'UseSiteJs' );
 		$useSiteCss = $this->getConfig()->get( 'UseSiteCss' );
 		if ( !$useSiteJs && !$useSiteCss ) {
-			return array();
+			return [];
 		}
 
-		// 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();
-			}
+		$user = $context->getUserObj();
+		if ( !$user || $user->isAnon() ) {
+			return [];
 		}
 
-		$pages = array();
+		$pages = [];
 		foreach ( $user->getEffectiveGroups() as $group ) {
 			if ( $group == '*' ) {
 				continue;
 			}
 			if ( $useSiteJs ) {
-				$pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' );
+				$pages["MediaWiki:Group-$group.js"] = [ 'type' => 'script' ];
 			}
 			if ( $useSiteCss ) {
-				$pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' );
+				$pages["MediaWiki:Group-$group.css"] = [ 'type' => 'style' ];
 			}
 		}
 		return $pages;
 	}
 
-	/* Methods */
-
 	/**
+	 * Get group name
+	 *
 	 * @return string
 	 */
 	public function getGroup() {