Unblacklist group-specific JS/CSS for the user group

Changes ResourceLoaderUserGroupsModule so that if the
user is in the 'user' group, i.e., the user is not
anonymous, then custom JS or CSS can be inserted using
system messages in the same way as is allowed for other
user groups.

Bug: 47812
Change-Id: I0ef9674e1a9e1e5db9537ba7b9578d2b7b14fd8e

diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 9004267..6757d39 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -59,7 +59,7 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 
                $pages = array();
                foreach ( $user->getEffectiveGroups() as $group ) {
-                       if ( in_array( $group, array( '*', 'user' ) ) ) {
+                       if ( $group == '*' ) {
                                continue;
                        }
                        if ( $wgUseSiteJs ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f8912eb..db361aa 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3794,6 +3794,7 @@ You can view its source',
 'print.css'               => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it
 'noscript.css'            => '/* CSS placed here will affect users with JavaScript disabled */', # only translate this message to other languages if you have to change it
 'group-autoconfirmed.css' => '/* CSS placed here will affect autoconfirmed users only */', # only translate this message to other languages if you have to change it
+'group-user.css'          => '/* CSS placed here will affect registered users only */', # only translate this message to other languages if you have to change it
 'group-bot.css'           => '/* CSS placed here will affect bots only */', # only translate this message to other languages if you have to change it
 'group-sysop.css'         => '/* CSS placed here will affect sysops only */', # only translate this message to other languages if you have to change it
 'group-bureaucrat.css'    => '/* CSS placed here will affect bureaucrats only */', # only translate this message to other languages if you have to change it
@@ -3805,6 +3806,7 @@ You can view its source',
 'modern.js'              => '/* Any JavaScript here will be loaded for users using the Modern skin */', # only translate this message to other languages if you have to change it
 'vector.js'              => '/* Any JavaScript here will be loaded for users using the Vector skin */', # only translate this message to other languages if you have to change it
 'group-autoconfirmed.js' => '/* Any JavaScript here will be loaded for autoconfirmed users only */', # only translate this message to other languages if you have to change it
+'group-user.js'          => '/* Any JavaScript here will be loaded for registered users only */', # only translate this message to other languages if you have to change it
 'group-bot.js'           => '/* Any JavaScript here will be loaded for bots only */', # only translate this message to other languages if you have to change it
 'group-sysop.js'         => '/* Any JavaScript here will be loaded for sysops only */', # only translate this message to other languages if you have to change it
 'group-bureaucrat.js'    => '/* Any JavaScript here will be loaded for bureaucrats only */', # only translate this message to other languages if you have to change it

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index dd6f7b4..bd85486 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -7852,6 +7852,7 @@ CSS applied to users using Monobook skin.',
 'print.css' => '{{optional}}',
 'noscript.css' => '{{optional}}',
 'group-autoconfirmed.css' => '{{doc-group|autoconfirmed|css}}',
+'group-user.css' => '{{doc-group|user|css}}',
 'group-bot.css' => '{{doc-group|bot|css}}',
 'group-sysop.css' => '{{doc-group|sysop|css}}',
 'group-bureaucrat.css' => '{{doc-group|bureaucrat|css}}',
@@ -7865,6 +7866,7 @@ JS for users using Monobook skin.',
 'modern.js' => '{{optional}}',
 'vector.js' => '{{optional}}',
 'group-autoconfirmed.js' => '{{doc-group|autoconfirmed|js}}',
+'group-user.js' => '{{doc-group|user|js}}',
 'group-bot.js' => '{{doc-group|bot|js}}',
 'group-sysop.js' => '{{doc-group|sysop|js}}',
 'group-bureaucrat.js' => '{{doc-group|bureaucrat|js}}',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index b06c11f..6d4a46d 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -322,6 +322,7 @@ $wgOptionalMessages = array(
        'print.css',
        'noscript.css',
        'group-autoconfirmed.css',
+       'group-user.css',
        'group-bot.css',
        'group-sysop.css',
        'group-bureaucrat.css',
@@ -331,6 +332,7 @@ $wgOptionalMessages = array(
        'modern.js',
        'vector.js',
        'group-autoconfirmed.js',
+       'group-user.js',
        'group-bot.js',
        'group-sysop.js',
        'group-bureaucrat.js',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 36f80bd..1e11da2 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2711,6 +2711,7 @@ $wgMessageStructure = array(
                'print.css',
                'noscript.css',
                'group-autoconfirmed.css',
+               'group-user.css',
                'group-bot.css',
                'group-sysop.css',
                'group-bureaucrat.css',
@@ -2722,6 +2723,7 @@ $wgMessageStructure = array(
                'modern.js',
                'vector.js',
                'group-autoconfirmed.js',
+               'group-user.js',
                'group-bot.js',
                'group-sysop.js',
                'group-bureaucrat.js',