diff --git a/VERSION b/VERSION index 6da4de57dc..f8c5ba1a78 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.4.1 +9.0.beta diff --git a/config/config.php b/config/config.php index 880c2c8294..7ee4c27738 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.4.1'; // The version of zentaopms. Don't change it. +$config->version = '9.0.beta'; // 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 ba4cdf86b8..ad84259dfa 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -113,3 +113,4 @@ $lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; $lang->upgrade->fromVersions['8_3'] = '8.3'; $lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; $lang->upgrade->fromVersions['8_4'] = '8.4'; +$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 8e317e126a..e0f3f3bdee 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -113,3 +113,4 @@ $lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; $lang->upgrade->fromVersions['8_3'] = '8.3'; $lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; $lang->upgrade->fromVersions['8_4'] = '8.4'; +$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 9beebc9c61..c528e42ea8 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -159,6 +159,8 @@ class upgradeModel extends model $this->renameMainLib(); $this->adjustPriv8_4(); case '8_4': + case '8_4_1': + $this->execSQL($this->getUpgradeFile('8.4.1')); } $this->deletePatch(); @@ -244,6 +246,7 @@ class upgradeModel extends model case '8_3': case '8_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.3.1')); case '8_4': + case '8_4_1': $confirmContent .= file_get_contents($this->getUpgradeFile('8.4.1')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }