private/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asdsad
All checks were successful
Deploy / deploy-staging (push) Successful in 23s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-06-17 22:59:24 +02:00
parent 6930a14d6b
commit 35d3d856b4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/App/UserSelfManagementService.php
View File

@@ -75,7 +75,7 @@ final class UserSelfManagementService
public function resolveActiveSkin(?string $requestedSkin, array $authUser, array $visibleApps, array $widgets, array $availableSkins): array public function resolveActiveSkin(?string $requestedSkin, array $authUser, array $visibleApps, array $widgets, array $availableSkins): array
{ {
$settings = $this->load($authUser, $visibleApps, $widgets, $availableSkins); $settings = $this->load($authUser, $visibleApps, $widgets, $availableSkins);
$storedSkin = (string) (($settings['desktop']['active_skin'] ?? '') ?: SkinResolver::DEFAULT_SKIN); $storedSkin = (string) (($settings['desktop']['active_skin'] ?? '') ?: $this->defaultSkin());
$resolvedSkin = SkinResolver::resolve($requestedSkin !== null && $requestedSkin !== '' ? $requestedSkin : $storedSkin); $resolvedSkin = SkinResolver::resolve($requestedSkin !== null && $requestedSkin !== '' ? $requestedSkin : $storedSkin);
if ($resolvedSkin !== $storedSkin) { if ($resolvedSkin !== $storedSkin) {
@@ -219,7 +219,7 @@ final class UserSelfManagementService
'profile' => $profile, 'profile' => $profile,
'desktop' => [ 'desktop' => [
'active_skin' => $this->sanitizeSkin( 'active_skin' => $this->sanitizeSkin(
(string) ($settings['desktop']['active_skin'] ?? SkinResolver::DEFAULT_SKIN), (string) ($settings['desktop']['active_skin'] ?? $this->defaultSkin()),
$availableSkins $availableSkins
), ),
], ],
@@ -271,7 +271,12 @@ final class UserSelfManagementService
{ {
$resolved = SkinResolver::resolve($skin); $resolved = SkinResolver::resolve($skin);
return in_array($resolved, $availableSkins, true) ? $resolved : SkinResolver::DEFAULT_SKIN; return in_array($resolved, $availableSkins, true) ? $resolved : $this->defaultSkin();
}
private function defaultSkin(): string
{
return SkinResolver::resolve(null);
} }
/** /**