diff --git a/module/dev/control.php b/module/dev/control.php index 6b04643e40..3ad1fb4cd0 100644 --- a/module/dev/control.php +++ b/module/dev/control.php @@ -95,7 +95,6 @@ class dev extends control public function langItem($type = 'common', $module = 'my', $method = '', $language = 'zh_cn') { $language = str_replace('_', '-', $language); - if($type == 'second' and empty($module)) $module = 'my'; $moduleName = $module; if($type == 'common' or $type == 'first') $moduleName = 'common'; if($type == 'second') $moduleName = $module . 'Menu'; diff --git a/module/dev/model.php b/module/dev/model.php index 8432aa9226..03e7c89d38 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -583,16 +583,24 @@ class devModel extends model * @access public * @return array */ - public function getFeatureMenus($menu, $module = '', $method = '') + public function getFeatureMenus($menu, $module = '', $method = '', $loadModules = array()) { - $this->app->loadLang($menu); $menus = array(); + $this->app->loadLang($menu); + if(!in_array($menu, $loadModules) and isset($this->lang->$menu->menu)) + { + $loadModules[] = $menu; + $menuLang = $this->getLinkTitle($this->lang->$menu->menu); + foreach($menuLang as $menuKey => $menuName) $menus += $this->getFeatureMenus($menuKey, $module, $method, $loadModules); + } + if(isset($this->lang->$menu->featureBar)) { - $featureBar = $this->lang->$menu->featureBar; + $featureBar = $this->lang->$menu->featureBar; foreach($featureBar as $methodName => $feature) { if($methodName == 'caselib') $methodName = 'caseLib'; + if($methodName == 'all') $methodName = 'browse'; $subMenu = new stdClass(); $subMenu->title = zget($this->lang->$menu, $methodName); @@ -638,8 +646,6 @@ class devModel extends model $mainNav = $this->getLinkTitle($mainNav); $maimNavPinYin = common::convert2Pinyin($mainNav); - - if(empty($module)) $module = 'my'; foreach($mainNav as $menuKey => $menu) { $menuItem = new stdclass();