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

[stable32] Fix admin delegation show all priority items
bugfix/fix-richdocuments-3815
Andy Scherzinger 3 months ago committed by GitHub
commit 56256aa8a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 3
      apps/settings/lib/Command/AdminDelegation/Show.php

@ -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));
}
}

Loading…
Cancel
Save