merge from 1.5.1.8

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions

View file

@ -75,7 +75,7 @@
unset($args);
// gnb item create
$gnbList = array('dashboard', 'site', 'user', 'content', 'theme', 'extensions', 'configuration');
$gnbList = array('dashboard', 'menu', 'user', 'content', 'theme', 'extensions', 'configuration');
foreach($gnbList AS $key=>$value)
{
//insert menu item
@ -239,7 +239,7 @@
{
switch($menuName) {
case 'siteMap':
return 'site';
return 'menu';
break;
case 'userList':
case 'userSetting':