1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-16 18:42:01 +02:00

Merge pull request #4559 from Deltik/fix/4527

Disable `USERTHEME` when `e_MENUMANAGER_ACTIVE`
This commit is contained in:
Cameron 2021-09-10 14:40:15 -07:00 committed by GitHub
commit b180ff8757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -782,7 +782,14 @@ if(!isset($_E107['no_module']))
if(!defined('USERTHEME') && !isset($_E107['no_theme']))
{
$dbg->logTime('Load Theme');
define('USERTHEME', (e107::getUser()->getPref('sitetheme') && file_exists(e_THEME.e107::getUser()->getPref('sitetheme'). '/theme.php') ? e107::getUser()->getPref('sitetheme') : false));
$userSiteTheme = e107::getUser()->getPref('sitetheme');
if (
empty($userSiteTheme) ||
(defined('e_MENUMANAGER_ACTIVE') && e_MENUMANAGER_ACTIVE === true) ||
!file_exists(e_THEME.$userSiteTheme. '/theme.php')
)
$userSiteTheme = false;
define('USERTHEME', $userSiteTheme);
}