mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Fix for admin-nav issue.

Browse Source
This commit is contained in:
Cameron
2012-11-30 14:09:28 -08:00
parent 646d65b58a
commit 3da14092ad
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/boot.php
View File

@@ -40,7 +40,7 @@ if(is_array($_plugins) && count($_plugins) > 0)
// Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed // Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed
include_once(e107::coreTemplatePath('admin_icons')); 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')) if (!defined('ADMIN_WIDTH'))
{ {

3
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1224,7 +1224,7 @@ class admin_shortcodes
$tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION')); $tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION'));
global $$tmpl; 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'); require_once(e_HANDLER.'admin_handler.php');
if($parm == 'home' || $parm == 'logout' || $parm == 'language') if($parm == 'home' || $parm == 'logout' || $parm == 'language')
@@ -1248,6 +1248,7 @@ class admin_shortcodes
foreach($admin_cat['id'] as $i => $cat) foreach($admin_cat['id'] as $i => $cat)
{ {
$id = $admin_cat['id'][$i]; $id = $admin_cat['id'][$i];
$menu_vars[$id]['text'] = $admin_cat['title'][$i]; $menu_vars[$id]['text'] = $admin_cat['title'][$i];
$menu_vars[$id]['description'] = $admin_cat['title'][$i]; $menu_vars[$id]['description'] = $admin_cat['title'][$i];