From: Kunal Mehta <legoktm@gmail.com>
Date: Sat, 1 Aug 2015 06:40:07 +0000 (-0700)
Subject: registration: Fix merging of $wgRevokePermissions
X-Git-Tag: 1.31.0-rc.0~10556
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=d75391883e9353f94c61e870618a1f48186cbb50;p=lhc%2Fweb%2Fwiklou.git

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 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] ) ) {