diff --git a/VERSION b/VERSION index 2bbd2b4b42..adbc6d2b1b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.1 +15.1 diff --git a/config/config.php b/config/config.php index fad76cba64..186ed887a2 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 = '15.0.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '15.1'; // 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/module/upgrade/model.php b/module/upgrade/model.php index 3407232c44..0129a3a515 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -674,9 +674,6 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('15.0')); $this->adjustBugOfProject(); $this->processBuildTable(); - $this->appendExec('15_0'); - case '15_0_1': - $this->saveLogs('Execute 15_0_1'); $this->updateProductVersion(); $this->appendExec('15_0_1'); }