diff --git a/db/update11.1.sql b/db/update11.1.sql new file mode 100644 index 0000000000..53bb4617fc --- /dev/null +++ b/db/update11.1.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_release` CHANGE `name` `name` varchar(255) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `build`; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index a3df969873..8e15177fbe 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -335,6 +335,9 @@ $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); //$lang->doc->menu->createLib = array('link' => ' 添加文件夹|doc|createLib', 'float' => 'right'); +$lang->svn = new stdclass(); +$lang->git = new stdclass(); + /* 统计视图菜单设置。*/ $lang->report = new stdclass(); $lang->report->menu = new stdclass(); diff --git a/module/git/lang/zh-cn.php b/module/git/lang/zh-cn.php index c8f983cc8e..e5181335cc 100644 --- a/module/git/lang/zh-cn.php +++ b/module/git/lang/zh-cn.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ /* 方法列表。*/ -$lang->git = new stdclass(); $lang->git->common = 'Git'; $lang->git->cat = '查看源代码'; $lang->git->diff = '比较源代码'; diff --git a/module/svn/lang/zh-cn.php b/module/svn/lang/zh-cn.php index 46cfa99cfd..510abc1109 100644 --- a/module/svn/lang/zh-cn.php +++ b/module/svn/lang/zh-cn.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ /* 方法列表。*/ -$lang->svn = new stdclass(); $lang->svn->common = 'Subversion'; $lang->svn->cat = '查看源代码'; $lang->svn->diff = '比较源代码'; diff --git a/module/user/model.php b/module/user/model.php index 458b8aedd2..6bc8284d09 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -336,7 +336,7 @@ class userModel extends model $group = new stdClass(); $group->account = $user->account; $group->group = $user->group; - $this->dao->insert(TABLE_USERGROUP)->data($group)->exec(); + $this->dao->replace(TABLE_USERGROUP)->data($group)->exec(); } unset($user->group); $this->dao->insert(TABLE_USER)->data($user)->autoCheck()->exec();