From 88ee97e72cab22197f1758ab7ebd797a06178e01 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 6 Nov 2014 01:03:23 +0000
Subject: [PATCH]  * change for upgrade.

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

diff --git a/VERSION b/VERSION
index 83fb27b1a3..7599684ac5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.2.stable
+6.3.stable
diff --git a/config/config.php b/config/config.php
index b4dbdc2ae0..f2ca73b6db 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      = '6.2';             // The version of zentaopms. Don't change it.
+$config->version      = '6.3';             // 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 6ed09366b8..fb425916f9 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -83,3 +83,4 @@ $lang->upgrade->fromVersions['5_3']       = '5.3';
 $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
 $lang->upgrade->fromVersions['6_0']       = '6.0';
 $lang->upgrade->fromVersions['6_1']       = '6.1';
+$lang->upgrade->fromVersions['6_2']       = '6.2';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 6ea357a34d..99292b96ae 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -83,3 +83,4 @@ $lang->upgrade->fromVersions['5_3']       = '5.3';
 $lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
 $lang->upgrade->fromVersions['6_0']       = '6.0';
 $lang->upgrade->fromVersions['6_1']       = '6.1';
+$lang->upgrade->fromVersions['6_2']       = '6.2';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index bd38384936..14cf5ab67f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -112,6 +112,7 @@ class upgradeModel extends model
                 $this->fixDataIndex();
             case '6_1':
                 $this->execSQL($this->getUpgradeFile('6.1'));
+            case '6_2':
 
             default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
         }
@@ -174,6 +175,7 @@ class upgradeModel extends model
         case '6_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('6.0.beta1'));
         case '6_0':       $confirmContent .= file_get_contents($this->getUpgradeFile('6.0'));
         case '6_1':       $confirmContent .= file_get_contents($this->getUpgradeFile('6.1'));
+        case '6_2':
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }