From ebe6a57fffae5dc8b681bb6b63793511ef1d4f90 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 28 Jun 2016 15:01:49 +0800 Subject: [PATCH] * add new version and upgrade. --- VERSION | 2 +- config/config.php | 2 +- 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 ++ 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 1365b9236b..11cb5b746c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.3 +8.2.4 diff --git a/config/config.php b/config/config.php index 7d20d0ad78..1453695581 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '8.2.3'; // The version of zentaopms. Don't change it. +$config->version = '8.2.4'; // The version of zentaopms. Don't change it. $config->charset = 'UTF-8'; // The charset of zentaopms. $config->cookieLife = time() + 2592000; // 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/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 29d44ca23a..1aee90e359 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -104,3 +104,4 @@ $lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; $lang->upgrade->fromVersions['8_2'] = '8.2'; $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; +$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 10768c9fd9..322e08c112 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -104,3 +104,4 @@ $lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; $lang->upgrade->fromVersions['8_2'] = '8.2'; $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; +$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index e7dd5a640e..6ac9e777ca 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -104,3 +104,4 @@ $lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; $lang->upgrade->fromVersions['8_2'] = '8.2'; $lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; $lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; +$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index f47c0f516d..a0bdac4a7c 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -145,6 +145,7 @@ class upgradeModel extends model case '8_2_1': $this->execSQL($this->getUpgradeFile('8.2.1')); case '8_2_2': + case '8_2_3': default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -225,6 +226,7 @@ class upgradeModel extends model case '8_2': case '8_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.2.1')); case '8_2_2': + case '8_2_3': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }