mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 20:30:39 +02:00
Fix for last commit.
This commit is contained in:
26
class2.php
26
class2.php
@@ -1264,28 +1264,26 @@ if(!isset($_E107['no_menus']))
|
|||||||
}
|
}
|
||||||
|
|
||||||
// here we USE the theme
|
// 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');
|
||||||
{
|
|
||||||
require_once (THEME.'admin_theme.php');
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
require_once (THEME.'theme.php');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
require_once (THEME.'theme.php');
|
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
|
// Load shortcode handler
|
||||||
|
@@ -2419,7 +2419,10 @@ class e107plugin
|
|||||||
$setup_file = e_PLUGIN.$path.'/'.str_replace("_menu","",$path).'_setup.php';
|
$setup_file = e_PLUGIN.$path.'/'.str_replace("_menu","",$path).'_setup.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
e107::getMessage()->addDebug("Checking for SetUp File: ".$setup_file);
|
if(deftrue('E107_DBG_INCLUDES'))
|
||||||
|
{
|
||||||
|
e107::getMessage()->addDebug("Checking for SetUp File: ".$setup_file);
|
||||||
|
}
|
||||||
|
|
||||||
if (is_readable($setup_file))
|
if (is_readable($setup_file))
|
||||||
{
|
{
|
||||||
|
@@ -27,7 +27,7 @@ $_E107['no_online'] = true;
|
|||||||
$_E107['no_forceuserupdate'] = true;
|
$_E107['no_forceuserupdate'] = true;
|
||||||
$_E107['no_menus'] = true;
|
$_E107['no_menus'] = true;
|
||||||
$_E107['no_maintenance'] = true;
|
$_E107['no_maintenance'] = true;
|
||||||
$_E107['no_theme'] = true;
|
//$_E107['no_theme'] = true;
|
||||||
require_once("../class2.php");
|
require_once("../class2.php");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user