diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index ca7859bee..ead1b419a 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1886,19 +1886,8 @@ Inverse 10 10
{
if (!ADMIN) return '';
- // global $admin_cat, $array_functions, $array_sub_functions, $pref;
-
- $pref = e107::getPref();
-
- $admin_cat = e107::getNav()->adminCats();
- $array_functions = e107::getNav()->adminLinks('legacy');
- $array_sub_functions = e107::getNav()->adminLinks('sub');
- $array_plugins = e107::getNav()->adminLinks('plugin2');
-
$tp = e107::getParser();
- $e107 = e107::getInstance();
- $sql = e107::getDb('sqlp');
parse_str($parm, $parms);
$tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION'));
@@ -1932,6 +1921,13 @@ Inverse 10 10
}
+ $pref = e107::getPref();
+
+ $admin_cat = e107::getNav()->adminCats();
+ $array_functions = e107::getNav()->adminLinks('legacy');
+ $array_sub_functions = e107::getNav()->adminLinks('sub');
+ $array_plugins = e107::getNav()->adminLinks('plugin2');
+
// MAIN LINK
if($parm != 'no-main')
@@ -1991,9 +1987,7 @@ Inverse 10 10
{
$active = $catid;
}
-
-
-
+
// e107::getDebug()->log($catid);
if(vartrue($pref['admin_slidedown_subs']) && vartrue($array_sub_functions[$key]))
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index dd5b3adaf..d79b39198 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -511,7 +511,7 @@ class e107_db_debug {
$aSum['DB Time'] += $tMarker['DB Time'];
$aSum['DB Count'] += $tMarker['DB Count'];
$tMarker['Time'] = number_format($thisDelta * 1000.0, 1);
- $tMarker['Time'] = $this->highlight($tMarker['Time'],$thisDelta,.5);
+ $tMarker['Time'] = $this->highlight($tMarker['Time'],$thisDelta,.2);
$tMarker['%Time'] = $totTime ? number_format(100.0 * ($thisDelta / $totTime), 0) : 0;