jenkins-bot has submitted this change and it was merged.
Change subject: Unblacklist group-specific JS/CSS for the user group
......................................................................
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
---
M includes/resourceloader/ResourceLoaderUserGroupsModule.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
5 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
Parent5446: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index 9004267..6757d39 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -59,7 +59,7 @@
$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
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3794,6 +3794,7 @@
'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 @@
'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
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -7852,6 +7852,7 @@
'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 @@
'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
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -322,6 +322,7 @@
'print.css',
'noscript.css',
'group-autoconfirmed.css',
+ 'group-user.css',
'group-bot.css',
'group-sysop.css',
'group-bureaucrat.css',
@@ -331,6 +332,7 @@
'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
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2711,6 +2711,7 @@
'print.css',
'noscript.css',
'group-autoconfirmed.css',
+ 'group-user.css',
'group-bot.css',
'group-sysop.css',
'group-bureaucrat.css',
@@ -2722,6 +2723,7 @@
'modern.js',
'vector.js',
'group-autoconfirmed.js',
+ 'group-user.js',
'group-bot.js',
'group-sysop.js',
'group-bureaucrat.js',
--
To view, visit https://gerrit.wikimedia.org/r/99434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ef9674e1a9e1e5db9537ba7b9578d2b7b14fd8e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Scimonster <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
