registration: Fix merging of $wgRevokePermissions

It's the same as $wgGroupPermissions.

Change-Id: I9c289219c53314970e7af5998c00d6a372bb00cb

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index 858f3bf..c9df4b1 100644 (file)
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -187,7 +187,7 @@ class ExtensionRegistry {
                                // 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] ) ) {