diff --git a/VERSION b/VERSION index 40c688ba36..a36c75923d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.stable +5.2.stable diff --git a/config/config.php b/config/config.php index 6dd1b548ff..171e3bb70e 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 = '5.1'; // The version of zentaopms. Don't change it. +$config->version = '5.2'; // 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 a8465b1e2e..0230773ed7 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -76,3 +76,4 @@ $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; $lang->upgrade->fromVersions['5_0'] = '5.0'; +$lang->upgrade->fromVersions['5_1'] = '5.1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 67b959e2e6..8b241f7c60 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -76,3 +76,4 @@ $lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; $lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; $lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; $lang->upgrade->fromVersions['5_0'] = '5.0'; +$lang->upgrade->fromVersions['5_1'] = '5.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 2f1f62deae..142499590d 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -96,6 +96,7 @@ class upgradeModel extends model case '5_0_beta1': case '5_0_beta2': case '5_0': + case '5_1': default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -150,6 +151,8 @@ class upgradeModel extends model case '4_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('4.3')); case '5_0_beta1': case '5_0_beta2': + case '5_0': + case '5_1': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }