jenkins-bot has submitted this change and it was merged.
Change subject: registration: Fix merging of $wgRevokePermissions
......................................................................
registration: Fix merging of $wgRevokePermissions
It's the same as $wgGroupPermissions.
Change-Id: I9c289219c53314970e7af5998c00d6a372bb00cb
---
M includes/registration/ExtensionRegistry.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/registration/ExtensionRegistry.php
b/includes/registration/ExtensionRegistry.php
index 858f3bf..c9df4b1 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -187,7 +187,7 @@
// Special case $wgHooks and
$wgExtensionCredits, which require a recursive merge.
// Ideally it would have been taken care of in
the first if block though.
$GLOBALS[$key] = array_merge_recursive(
$GLOBALS[$key], $val );
- } elseif ( $key === 'wgGroupPermissions' ) {
+ } elseif ( $key === 'wgGroupPermissions' || $key ===
'wgRevokePermissions' ) {
// First merge individual groups
foreach ( $GLOBALS[$key] as $name => &$groupVal
) {
if ( isset( $val[$name] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/228449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c289219c53314970e7af5998c00d6a372bb00cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
