From ac9fb632ae03c58f45cb3b3e76aa652cf20ed904 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Mon, 29 Apr 2013 13:41:57 +0000 Subject: [PATCH] * upgrade the version. * adjust code format. --- VERSION | 2 +- config/config.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 4f051f77d6..f98af0f3aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1.stable +4.1.stable diff --git a/config/config.php b/config/config.php index a0a0d7f39a..fa8d978510 100644 --- a/config/config.php +++ b/config/config.php @@ -17,8 +17,8 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '4.0.1'; // The version of zentaopms. Don't change it. -$config->charset = 'UTF-8'; // The encoding of zentaopms. +$config->version = '4.1'; // 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 $config->webRoot = ''; // The root path of the pms.