1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00

Fix for Menu-Manager not display Menu area under some circumstances.

This commit is contained in:
Cameron
2017-01-12 17:36:00 -08:00
parent 2f063319e5
commit 276d4a52f4
2 changed files with 18 additions and 11 deletions

View File

@@ -16,15 +16,18 @@ if(isset($_GET['configure']))
define("USER_AREA", true);
//Switch to desired layout
define('THEME_LAYOUT', $_GET['configure']);
define('e_DEBUG', false);
define('E107_DEBUG_LEVEL', 0);
if(function_exists('xdebug_disable'))
{
xdebug_disable();
}
@ini_set('display_errors', 0);
error_reporting(0);
if(empty($_GET['debug']))
{
define('e_DEBUG', false);
define('E107_DEBUG_LEVEL', 0);
if(function_exists('xdebug_disable'))
{
xdebug_disable();
}
@ini_set('display_errors', 0);
error_reporting(0);
}
define('e_MENUMANAGER_ACTIVE', true);
}

View File

@@ -1489,10 +1489,11 @@ class e_menuManager {
}
else if(strstr($str, "MENU"))
{
$matches = array();
if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $str, $matches))
{
$menuText = "";
foreach($matches[1] as $menu)
{
@@ -1501,7 +1502,7 @@ class e_menuManager {
{
$menuText .= $sc_style['MENU']['pre'];
}
// ---------------
$menuText .= "\n\n<!-- START AREA ".$menu." -->";
@@ -1569,10 +1570,13 @@ class e_menuManager {
}
$ns->tablerender('', varset($menuText));
echo $menuText;
// $ns->tablerender('', varset($menuText)); // Could fail with a badly built theme.
}
else
{
echo $tp->parseTemplate($str,true);
}