Index: trunk/kernel/action.php =================================================================== diff -u -N -r5431 -r6093 --- trunk/kernel/action.php (.../action.php) (revision 5431) +++ trunk/kernel/action.php (.../action.php) (revision 6093) @@ -4,18 +4,10 @@ // ====== Debugger related: begin ====== $script = basename($_SERVER['PHP_SELF']); - $skipDebug = Array('index.php', 'tree.php', 'head.php', 'credits.php'); - if( admin_login() && !in_array($script, $skipDebug) ) - { - if( IsDebugMode() ) - { - if($Action) $debugger->setHTMLByIndex(1,'Kernel Action: '.$Action.'','append'); - if (!constOn('REDIRECT_REQUIRED')) { - echo ''; - if (!constOn('DBG_ZEND_PRESENT')) { - echo '  
'; - } - } + $skipDebug = Array('index.php', 'credits.php'); + if (admin_login() && !in_array($script, $skipDebug)) { + if (IsDebugMode() && $Action) { + $debugger->setHTMLByIndex(1, 'Kernel Action: '.$Action.'', 'append'); } } unset($script, $skipDebug); @@ -48,7 +40,7 @@ 'm_rule_delete' => 'in-portal:user_banlist.delete', 'm_ban_user' => 'in-portal:user_list.add|in-portal:user_list.edit', ); - checkActionPermission($action_mapping, $Action); + checkActionPermission($action_mapping, $Action, 1); // permission checking: end switch($Action) @@ -65,7 +57,8 @@ $cat = $objCatList->GetByResource($cat_id); if(is_object($cat)) { - $navbar = $cat->Get('CachedNavbar'); + $ml_formatter =& $application->recallObject('kMultiLanguage'); + $navbar = $cat->Get( $ml_formatter->LangFieldName('CachedNavbar') ); $objSession->SetVariable('catnavbar', $navbar); $objSession->SetVariable('import_category_id', $cat->UniqueId() ); }