From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 .../resourceloader/ResourceLoaderUserGroupsModule.php     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 1316f423..9064263f 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -33,12 +33,15 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 	 * @return array
 	 */
 	protected function getPages( ResourceLoaderContext $context ) {
-		global $wgUser;
+		global $wgUser, $wgUseSiteJs, $wgUseSiteCss;
 
 		$userName = $context->getUser();
 		if ( $userName === null ) {
 			return array();
 		}
+		if ( !$wgUseSiteJs && !$wgUseSiteCss ) {
+			return array();
+		}
 
 		// Use $wgUser is possible; allows to skip a lot of code
 		if ( is_object( $wgUser ) && $wgUser->getName() == $userName ) {
@@ -51,12 +54,16 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 		}
 
 		$pages = array();
-		foreach( $user->getEffectiveGroups() as $group ) {
+		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' );
+			if ( $wgUseSiteJs ) {
+				$pages["MediaWiki:Group-$group.js"] = array( 'type' => 'script' );
+			}
+			if ( $wgUseSiteCss ) {
+				$pages["MediaWiki:Group-$group.css"] = array( 'type' => 'style' );
+			}
 		}
 		return $pages;
 	}
-- 
cgit v1.2.3-54-g00ecf