Merge "registration: Support Change/RemoveCredentialsBlacklist in extension.json"

[lhc/web/wiklou.git] / includes / registration / ExtensionProcessor.php

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index ac9b526..f1f7c2e 100644 (file)
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -15,6 +15,8 @@ class ExtensionProcessor implements Processor {
                'HiddenPrefs',
                'GroupPermissions',
                'RevokePermissions',
+               'GrantPermissions',
+               'GrantPermissionGroups',
                'ImplicitGroups',
                'GroupsAddToSelf',
                'GroupsRemoveFromSelf',
@@ -63,6 +65,7 @@ class ExtensionProcessor implements Processor {
        protected static $mergeStrategies = [
                'wgGroupPermissions' => 'array_plus_2d',
                'wgRevokePermissions' => 'array_plus_2d',
+               'wgGrantPermissions' => 'array_plus_2d',
                'wgHooks' => 'array_merge_recursive',
                'wgExtensionCredits' => 'array_merge_recursive',
                'wgExtraGenderNamespaces' => 'array_plus',