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

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

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

5
e107_admin/menus.php
View File

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

6
e107_handlers/menumanager_class.php
View File

@@ -1493,6 +1493,7 @@ class e_menuManager {
$matches = array(); $matches = array();
if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $str, $matches)) if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $str, $matches))
{ {
$menuText = ""; $menuText = "";
foreach($matches[1] as $menu) foreach($matches[1] as $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 else
{ {
echo $tp->parseTemplate($str,true); echo $tp->parseTemplate($str,true);
} }