From d71f095975f12869d8734fdbdb91e2ee5fd4c9a1 Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Wed, 21 Jun 2017 11:20:46 +0800 Subject: [PATCH] * Update version info --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 9 +++++++++ module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 2 ++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 45acc9e667..ecb002acb7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.2.1 +9.3.beta diff --git a/config/config.php b/config/config.php index 373c9ca403..654e63ac09 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '9.2.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '9.3.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 71228410e9..ab4197f72f 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,12 @@ +2017-06-21 9.3.beta +3038 修改loadModel改为单例模式,提升性能 +3040 增加过滤文件白名单模式 +3042 修改框架中getCSS和getJS方法，当extensionLevel等于0时，返回的数据不正确 +3043 修改框架里面createLink的判断有问题的bug。 +3047 提供集中的参数过滤功能 +3048 提供基础的文件上传模块 +3061 将修复bug和安全等问题的新框架合并到禅道 + 2017-05-22 9.2.1 修复的Bug 无法添加待办。 diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index f6d9999faf..ca687bd6d2 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -121,3 +121,4 @@ $lang->upgrade->fromVersions['9_1'] = '9.1'; $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; +$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index b6dfbc3403..416468d776 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -121,3 +121,4 @@ $lang->upgrade->fromVersions['9_1'] = '9.1'; $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; +$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 8ca8f14647..6ecf6441d7 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -121,3 +121,4 @@ $lang->upgrade->fromVersions['9_1'] = '9.1'; $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; +$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 851c689718..98b4646fdd 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -179,6 +179,7 @@ class upgradeModel extends model $this->processCustomMenus(); $this->adjustPriv9_2(); case '9_2': + case '9_2_1': } $this->deletePatch(); @@ -272,6 +273,7 @@ class upgradeModel extends model case '9_1_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.1')); case '9_1_2': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.2')); case '9_2': + case '9_2_1': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }