Merge branch 'master' into sprint/biz17

module/dev/lang/de.php

@@ -158,6 +158,9 @@ $lang->dev->groupList['api']       = 'API';
 $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
+global $config;
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
+
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
 $lang->dev->endGroupList['other']  = 'Andere';

module/dev/lang/en.php

@@ -158,6 +158,9 @@ $lang->dev->groupList['api']       = 'API';
 $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
+global $config;
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
+
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
 $lang->dev->endGroupList['other']  = 'Others';

module/dev/lang/fr.php

@@ -158,6 +158,9 @@ $lang->dev->groupList['api']       = 'API';
 $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
+global $config;
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
+
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'Syst?me';
 $lang->dev->endGroupList['other']  = 'Autres';

module/dev/lang/zh-cn.php

@@ -158,6 +158,9 @@ $lang->dev->groupList['api']       = 'API';
 $lang->dev->groupList['message']   = '消息';
 $lang->dev->groupList['search']    = '搜索';
 
+global $config;
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
+
 $lang->dev->endGroupList['admin']  = '后台';
 $lang->dev->endGroupList['system'] = '系统';
 $lang->dev->endGroupList['other']  = '其他';

module/dev/model.php

@@ -148,7 +148,7 @@ class devModel extends model
         foreach($methods as $method)
         {
             if($method->class == 'baseControl' or $method->class == 'control' or $method->name == '__construct') continue;
-            $api = array('name' => $method->name, 'post' => false, 'param' => array());
+            $api = array('name' => $method->name, 'post' => false, 'param' => array(), 'desc' => '');
             $methodReflect = new ReflectionMethod($module, $method->name);
             foreach($methodReflect->getParameters() as $key => $param)
             {