composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when accessing a backoffice page in maintenance mode (regression from e2f30182)

Browse Source
This commit is contained in:
Molkobain
2021-04-12 12:05:50 +02:00
parent fa3140cc13
commit c0f5906dce
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/themehandler.class.inc.php
View File

@@ -73,10 +73,7 @@ class ThemeHandler
public static function GetApplicationThemeId(): string
{
try {
if (is_null(MetaModel::GetConfig())) {
throw new CoreException('no config');
}
$sThemeId = MetaModel::GetConfig()->Get('backoffice_default_theme');
$sThemeId = utils::GetConfig()->Get('backoffice_default_theme');
}
catch (CoreException $oCompileException) {
// Fallback on our default theme in case the config. is not available yet
@@ -96,8 +93,7 @@ class ThemeHandler
$sThemeId = null;
try {
$oConf = MetaModel::GetConfig();
if ((!is_null($oConf)) && (true === $oConf->Get('user_preferences.allow_backoffice_theme_override'))) {
if (true === utils::GetConfig()->Get('user_preferences.allow_backoffice_theme_override')) {
$sThemeId = appUserPreferences::GetPref('backoffice_theme', null);
}
}
@@ -188,7 +184,8 @@ class ThemeHandler
{
try {
// Try to compile theme defined in the configuration
$sThemeId = static::GetCurrentUserThemeId();
// Note: In maintenance mode we should stick to the app theme (also we don't have access to many PHP classes, including the user preferences)
$sThemeId = SetupUtils::IsInMaintenanceMode() ? static::GetApplicationThemeId() : static::GetCurrentUserThemeId();
static::CompileTheme($sThemeId);
}
catch (CoreException $oCompileException) {