From a04db8bc49ab89d6e17dfc82d38aad67a6d46abd Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 8 Mar 2016 16:27:47 +0800
Subject: [PATCH]  * change for upgrade.

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

diff --git a/VERSION b/VERSION
index cd1d2e94f3..d7764b2a6c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.1
+8.1.stable
diff --git a/config/config.php b/config/config.php
index 7dab5bd382..e006d6a7d0 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      = '8.0.1';             // The version of zentaopms. Don't change it.
+$config->version      = '8.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/db/update8.0.1.sql b/db/update8.0.1.sql
index 14e99f33f9..65e8f55f1c 100644
--- a/db/update8.0.1.sql
+++ b/db/update8.0.1.sql
@@ -1,6 +1,6 @@
 ALTER TABLE `zt_action` ADD INDEX `action` (`objectID`, `product`, `project`, `action`, `date`);
 ALTER TABLE `zt_branch` ADD INDEX `branch` (`product`);
-ALTER TABLE `zt_bug` ADD INDEX `bug` (`product`,`module`,`project`,`assignedTo`)
+ALTER TABLE `zt_bug` ADD INDEX `bug` (`product`,`module`,`project`,`assignedTo`);
 ALTER TABLE `zt_build` ADD INDEX `build` (`product`, `project`);
 ALTER TABLE `zt_case` ADD INDEX `case` (`product`, `module`, `story`);
 ALTER TABLE `zt_cron` ADD INDEX `cron` (`lastTime`);
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index dc78d8d18b..82198259eb 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['7_2_5']     = '7.2.5';
 $lang->upgrade->fromVersions['7_3']       = '7.3';
 $lang->upgrade->fromVersions['7_4_beta']  = '7.4.beta';
 $lang->upgrade->fromVersions['8_0']       = '8.0';
+$lang->upgrade->fromVersions['8_0_1']     = '8.0.1';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 2e3a132359..e7ea9a2310 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['7_2_5']     = '7.2.5';
 $lang->upgrade->fromVersions['7_3']       = '7.3';
 $lang->upgrade->fromVersions['7_4_beta']  = '7.4.beta';
 $lang->upgrade->fromVersions['8_0']       = '8.0';
+$lang->upgrade->fromVersions['8_0_1']     = '8.0.1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 7b38975413..f8fa2e122f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -131,6 +131,8 @@ class upgradeModel extends model
             case '7_4_beta':
                 $this->execSQL($this->getUpgradeFile('7.4.beta'));
             case '8_0':
+            case '8_0_1':
+                $this->execSQL($this->getUpgradeFile('8.0.1'));
 
             default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
         }
@@ -203,6 +205,7 @@ class upgradeModel extends model
         case '7_3':       $confirmContent .= file_get_contents($this->getUpgradeFile('7.3'));
         case '7_4_beta':  $confirmContent .= file_get_contents($this->getUpgradeFile('7.4.beta'));
         case '8_0':
+        case '8_0_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('8.0.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -651,7 +654,7 @@ class upgradeModel extends model
     public function execSQL($sqlFile)
     {
         $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
-        $ignoreCode   = '|1050|1060|1062|1091|1169|';
+        $ignoreCode   = '|1050|1060|1062|1091|1169|1061|';
 
         /* Read the sql file to lines, remove the comment lines, then join theme by ';'. */
         $sqls = explode("\n", file_get_contents($sqlFile));