Merge "Remove 'prefsnologin' message, don't use 'watchnologin' where inappropriate"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderUserGroupsModule.php

diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 1316f42..9064263 100644 (file)
--- 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;
        }