Merge pull request #55647 from nextcloud/backport/55602/stable31

[stable31] [internal] Fix admin delegation show all priority items

Author: sorbaugh

apps/settings/lib/Command/AdminDelegation/Show.php

@@ -112,6 +112,7 @@ private function formatSettingsData(array $settings): array {
 			return [
 				'name' => $setting->getName() ?: 'Global',
 				'className' => $className,
+				'priority' => $setting->getPriority(),
 				'delegatedGroups' => $groups,
 			];
 		}, $settings);
@@ -155,6 +156,6 @@ private function validateOutputFormat(string $format): bool {
 	 * @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));
 	}
 }