From 4121940ff1466b0c06fdebc35cc8dbd1f9c9213e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 24 May 2023 19:39:29 -0700 Subject: [PATCH] Avoid CSS issue when upgrading to v1.2.29 without flushing user sessions Fixes #5265 --- app/Core/User/UserSession.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Core/User/UserSession.php b/app/Core/User/UserSession.php index 485ec8165..07d3646a2 100644 --- a/app/Core/User/UserSession.php +++ b/app/Core/User/UserSession.php @@ -207,7 +207,13 @@ class UserSession extends Base return 'light'; } - return session_get('user')['theme']; + $user_session = session_get('user'); + + if (array_key_exists('theme', $user_session)) { + return $user_session['theme']; + } + + return 'light'; } /** @@ -273,7 +279,7 @@ class UserSession extends Base if (! session_exists('listOrder:'.$projectID)) { return $default; - } + } return session_get('listOrder:'.$projectID); }