From d26f7e47fbcaf5f52cb4d0ca7bf64bdcfe9a9eb8 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 3 Jun 2018 01:40:55 +0200 Subject: [PATCH] Patch for issue #14348 Closes: #14348 Signed-off-by: William Desportes --- libraries/classes/ThemeManager.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index 4151558963..7b493516b6 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -90,6 +90,8 @@ class ThemeManager $this->theme = new Theme; + $config_theme_exists = true; + if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) { trigger_error( sprintf( @@ -98,15 +100,16 @@ class ThemeManager ), E_USER_ERROR ); - $GLOBALS['cfg']['ThemeDefault'] = false; + $config_theme_exists = false; + } else { + $this->theme_default = $GLOBALS['cfg']['ThemeDefault']; } - $this->theme_default = $GLOBALS['cfg']['ThemeDefault']; // check if user have a theme cookie $cookie_theme = $this->getThemeCookie(); if (! $cookie_theme || ! $this->setActiveTheme($cookie_theme)) { - if ($GLOBALS['cfg']['ThemeDefault']) { + if ($config_theme_exists) { // otherwise use default theme $this->setActiveTheme($this->theme_default); } else {