mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Fix for last commit.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
class2.php
View File

@@ -1264,10 +1264,8 @@ 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');
@@ -1276,17 +1274,17 @@ if(!isset($_E107['no_theme']))
{ {
require_once (THEME.'theme.php'); require_once (THEME.'theme.php');
} }
} }
else else
{ {
require_once (THEME.'theme.php'); require_once (THEME.'theme.php');
if(isset($SC_WRAPPER)) if(isset($SC_WRAPPER))
{ {
e107::scStyle($SC_WRAPPER); e107::scStyle($SC_WRAPPER);
} }
}
} }
//---------------------------- //----------------------------
// Load shortcode handler // Load shortcode handler
//---------------------------- //----------------------------

3
e107_handlers/plugin_class.php
View File

@@ -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';
} }
if(deftrue('E107_DBG_INCLUDES'))
{
e107::getMessage()->addDebug("Checking for SetUp File: ".$setup_file); e107::getMessage()->addDebug("Checking for SetUp File: ".$setup_file);
}
if (is_readable($setup_file)) if (is_readable($setup_file))
{ {

2
e107_images/secimg.php
View 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");
/* /*