maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'main' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Maurice Preuß (envoyr)
2022-12-21 20:25:11 +01:00
parent 669072d996 a81065a1b0
commit d2d3cec4f5
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Froxlor/UI/Panel/UI.php
View File

@@ -274,11 +274,12 @@ class UI
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;
// customer theme
if (CurrentUser::hasSession() && CurrentUser::getField('theme') != $theme) {
$theme = CurrentUser::getField('theme');
} else {
$theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $theme;
// customer theme
if (CurrentUser::hasSession() && CurrentUser::getField('theme') != $theme) {
$theme = CurrentUser::getField('theme');
}
}
}
if (!file_exists(Froxlor::getInstallDir() . '/templates/' . $theme)) {