From 1d7a142b247a5ea2c7e768845ccaa90d260b5173 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Sun, 4 Mar 2012 02:21:48 +0000 Subject: [PATCH] * fix the error when upgrade. --- config/config.php | 2 +- module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/config.php b/config/config.php index 11ed1a4315..eaafdce250 100644 --- a/config/config.php +++ b/config/config.php @@ -12,7 +12,7 @@ * @link http://www.zentao.net */ /* Basic settings. */ -$config->version = '3.0.stable'; // The version of zentaopms. Don't change it. +$config->version = '3.0'; // The version of zentaopms. Don't change it. $config->encoding = 'UTF-8'; // The encoding of znetaopms. $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 09c41dfe9e..c066df8c2e 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2'] = '2.2'; $lang->upgrade->fromVersions['2_3'] = '2.3'; $lang->upgrade->fromVersions['2_4'] = '2.4'; $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1'; +$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index e55fa13ccd..f061a8e610 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2'] = '2.2'; $lang->upgrade->fromVersions['2_3'] = '2.3'; $lang->upgrade->fromVersions['2_4'] = '2.4'; $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1'; +$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 020bd1e949..f521d2dcfc 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -59,3 +59,4 @@ $lang->upgrade->fromVersions['2_2'] = '2.2'; $lang->upgrade->fromVersions['2_3'] = '2.3'; $lang->upgrade->fromVersions['2_4'] = '2.4'; $lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1'; +$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';