From 21954505b2dd8a4d2d034ecf50a28034622ea809 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 16 Oct 2022 11:39:30 +0200 Subject: [PATCH] only set default_theme to fixed value if in update process of 0.10.x to 2.0.0-beta1 (or later) Signed-off-by: Michael Kaufmann --- lib/Froxlor/UI/Panel/UI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Froxlor/UI/Panel/UI.php b/lib/Froxlor/UI/Panel/UI.php index dd68d7ad..9e2c7ac5 100644 --- a/lib/Froxlor/UI/Panel/UI.php +++ b/lib/Froxlor/UI/Panel/UI.php @@ -271,8 +271,8 @@ class UI $theme = self::$default_theme; if (!self::$install_mode) { // system default - if (Froxlor::DBVERSION <= 202299999) { - // @fixme set this to the last 0.10.x DBVERSION to fallback to the new theme + if (Froxlor::versionCompare2(Settings::Get('panel.version'), '2.0.0-beta1') == -1) { + // pre 2.0 Settings::Set('panel.default_theme', 'Froxlor'); } $theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $theme;