From d75391883e9353f94c61e870618a1f48186cbb50 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 31 Jul 2015 23:40:07 -0700 Subject: [PATCH] registration: Fix merging of $wgRevokePermissions It's the same as $wgGroupPermissions. Change-Id: I9c289219c53314970e7af5998c00d6a372bb00cb --- includes/registration/ExtensionRegistry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php index 858f3bfe2c..c9df4b17df 100644 --- 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] ) ) { -- 2.20.1