1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00

Fix for last commit.

This commit is contained in:
Cameron
2016-02-26 12:50:48 -08:00
parent c2349c6876
commit 2eaffd9822
3 changed files with 17 additions and 16 deletions

View File

@@ -1264,28 +1264,26 @@ if(!isset($_E107['no_menus']))
}
// here we USE the theme
if(!isset($_E107['no_theme']))
if(e_ADMIN_AREA)
{
if(e_ADMIN_AREA)
if(file_exists(THEME.'admin_theme.php')&&(strpos(e_SELF.'?'.e_QUERY, $ADMIN_DIRECTORY.'menus.php?configure')===FALSE)) // no admin theme when previewing.
{
if(file_exists(THEME.'admin_theme.php')&&(strpos(e_SELF.'?'.e_QUERY, $ADMIN_DIRECTORY.'menus.php?configure')===FALSE)) // no admin theme when previewing.
{
require_once (THEME.'admin_theme.php');
}
else
{
require_once (THEME.'theme.php');
}
require_once (THEME.'admin_theme.php');
}
else
{
require_once (THEME.'theme.php');
if(isset($SC_WRAPPER))
{
e107::scStyle($SC_WRAPPER);
}
}
}
else
{
require_once (THEME.'theme.php');
if(isset($SC_WRAPPER))
{
e107::scStyle($SC_WRAPPER);
}
}
//----------------------------
// Load shortcode handler