upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 16:35:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #56043 from nextcloud/backport/55462/stable32

Browse source 
[stable32] Fix admin delegation show all priority items
This commit is contained in:
Andy Scherzinger 2025-11-02 00:35:06 +01:00 committed by GitHub
commit 56256aa8a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/settings/lib/Command/AdminDelegation/Show.php
View file

@ -112,6 +112,7 @@ class Show extends Base {
return [
'name' => $setting->getName() ?: 'Global',
'className' => $className,
'priority' => $setting->getPriority(),
'delegatedGroups' => $groups,
];
}, $settings);
@ -155,6 +156,6 @@ class Show extends Base {
* @param array $innerSection
*/
private function getDelegatedSettings(array $settings, array $innerSection): array {
return $settings + array_filter($innerSection, fn (ISettings $setting) => $setting instanceof IDelegatedSettings);
return array_merge($settings, array_filter($innerSection, fn (ISettings $setting) => $setting instanceof IDelegatedSettings));
}
}