Add support for removing permissions from ManageWiki

miraheze · Jan 8, 2024 · ea618ec · ea618ec
1 parent f8489ef
commit ea618ec
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/includes/Hooks.php b/includes/Hooks.php
@@ -170,15 +170,24 @@ public static function onCreateWikiJsonBuilder( string $wiki, DBConnRef $dbr, ar
 
 			foreach ( $permObjects as $perm ) {
 				$addPerms = [];
+				$removePerms = [];
 
 				foreach ( ( self::getConfig( 'ManageWikiPermissionsAdditionalRights' )[$perm->perm_group] ?? [] ) as $right => $bool ) {
 					if ( $bool ) {
 						$addPerms[] = $right;
+						continue;
+					}
+
+					if ( $bool === false ) {
+						$removePerms[] = $right;
 					}
 				}
 
+				$permissions = array_merge( json_decode( $perm->perm_permissions ?? '', true ) ?? [], $addPerms );
+				$filteredPermissions = array_diff( $permissions, $removePerms );
+
 				$jsonArray['permissions'][$perm->perm_group] = [
-					'permissions' => array_merge( json_decode( $perm->perm_permissions ?? '', true ) ?? [], $addPerms ),
+					'permissions' => $filteredPermissions,
 					'addgroups' => array_merge(
 						json_decode( $perm->perm_addgroups ?? '', true ) ?? [],
 						self::getConfig( 'ManageWikiPermissionsAdditionalAddGroups' )[$perm->perm_group] ?? []