From 1ea6101aa95bcdf19b01ed6de7415149638ac62b Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Sat, 28 Sep 2013 14:30:14 +0800
Subject: [PATCH]  + add upgrade from 5.0 to 5.1

---
 config/config.php             | 2 +-
 module/group/lang/en.php      | 1 +
 module/group/lang/zh-cn.php   | 1 +
 module/upgrade/lang/en.php    | 1 +
 module/upgrade/lang/zh-cn.php | 1 +
 module/upgrade/model.php      | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/config.php b/config/config.php
index da195e1d10..6dd1b548ff 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.0';       // The version of zentaopms. Don't change it.
+$config->version      = '5.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
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index d9b742a2a9..eca5b28531 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
 $lang->group->copyOptions['copyUser'] = 'Copy user';
 
 $lang->group->versions['']          = 'History';
+$lang->group->versions['5_1']       = 'Zentao 5.1';
 $lang->group->versions['5_0_beta2'] = 'Zentao 5.0.beta2';
 $lang->group->versions['5_0_beta1'] = 'Zentao 5.0.beta1';
 $lang->group->versions['4_3_beta']  = 'Zentao 4.3.beta';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 17b14bd562..acc8db0c37 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
 
 $lang->group->versions['']          = '修改历史';
+$lang->group->versions['5_1']       = '禅道5.1';
 $lang->group->versions['5_0_beta2'] = '禅道5.0.beta2';
 $lang->group->versions['5_0_beta1'] = '禅道5.0.beta1';
 $lang->group->versions['4_3_beta']  = '禅道4.3.beta';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 33d80cd4fe..a9dc8a1351 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -75,3 +75,4 @@ $lang->upgrade->fromVersions['4_2_beta']  = '4.2.beta';
 $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_1']       = '5.1';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 962998ebc4..0141b55cdc 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -75,3 +75,4 @@ $lang->upgrade->fromVersions['4_2_beta']  = '4.2.beta';
 $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_1']       = '5.1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 87a82680b2..2f1f62deae 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -95,6 +95,7 @@ class upgradeModel extends model
                 $this->execSQL($this->getUpgradeFile('4.3'));
             case '5_0_beta1':
             case '5_0_beta2':
+            case '5_0':
 
             default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
         }