diff --git a/e107_admin/boot.php b/e107_admin/boot.php index d5387297a..54bb12278 100644 --- a/e107_admin/boot.php +++ b/e107_admin/boot.php @@ -40,7 +40,7 @@ if(is_array($_plugins) && count($_plugins) > 0) // Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed include_once(e107::coreTemplatePath('admin_icons')); -require_once (e_ADMIN.'ad_links.php'); +require_once (e_ADMIN.'ad_links.php'); //FIXME - see 'FIXME' in sc_admin_navigation if (!defined('ADMIN_WIDTH')) { diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index a96ffce6a..dcf0d80a1 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1224,7 +1224,7 @@ class admin_shortcodes $tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION')); global $$tmpl; - require_once(e_ADMIN.'ad_links.php'); + require(e_ADMIN.'ad_links.php'); //FIXME loaded in boot.php but $admin_cat is not available here. require_once(e_HANDLER.'admin_handler.php'); if($parm == 'home' || $parm == 'logout' || $parm == 'language') @@ -1248,6 +1248,7 @@ class admin_shortcodes foreach($admin_cat['id'] as $i => $cat) { + $id = $admin_cat['id'][$i]; $menu_vars[$id]['text'] = $admin_cat['title'][$i]; $menu_vars[$id]['description'] = $admin_cat['title'][$i];