mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Removed old deprecated global $e107_debug. Cleaned up debug_handler.php (e107_debug class)

Browse Source
This commit is contained in:
Cameron
2020-04-26 13:32:18 -07:00
parent 406f74e3a5
commit 326305f5f2
11 changed files with 195 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/menu_class.php
View File

@@ -600,7 +600,7 @@ class e_menu
// global $sql; // required at the moment.
global $sc_style, $e107_debug;
global $sc_style;
$sql = e107::getDb();
@@ -627,7 +627,7 @@ class e_menu
{
echo "\n<!-- Menu Start: ".$mname." -->\n";
}
e107::getDB()->db_Mark_Time($mname);
e107::getDb()->db_Mark_Time($mname);
if(is_numeric($mpath) || ($mname === false)) // Custom Page/Menu
{
@@ -639,7 +639,7 @@ class e_menu
if(!empty($page['menu_class']) && !check_class($page['menu_class']))
{
echo "\n<!-- Menu not rendered due to userclass settings -->\n";
return;
return null;
}
$caption = (vartrue($page['menu_icon'])) ? $tp->toIcon($page['menu_icon']) : '';
@@ -694,9 +694,9 @@ class e_menu
$pref = e107::getPref(); // possibly used by plugin menu.
$e107_debug ? include(e_PLUGIN.$mpath.$mname.'.php') : @include(e_PLUGIN.$mpath.$mname.'.php');
deftrue('e_DEBUG') ? include(e_PLUGIN.$mpath.$mname.'.php') : @include(e_PLUGIN.$mpath.$mname.'.php');
}
e107::getDB()->db_Mark_Time("(After ".$mname.")");
e107::getDb()->db_Mark_Time("(After ".$mname.")");
if(e_DEBUG === true)
{
@@ -709,5 +709,8 @@ class e_menu
ob_end_clean();
return $ret;
}
unset($pref);
return null;
}
}