From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: 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
---
 .../ResourceLoaderUserGroupsModule.php             | 39 ++++++++++++++--------
 1 file changed, 26 insertions(+), 13 deletions(-)

(limited to 'includes/resourceloader/ResourceLoaderUserGroupsModule.php')

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 */
-- 
cgit v1.2.3-54-g00ecf