From f2d58faaf16da186841dd4df0d42f83c28514b0e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 7 Sep 2018 14:37:45 +0800
Subject: [PATCH]  * change for upgrade.

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

diff --git a/VERSION b/VERSION
index 5632995043..a936832581 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.3.stable
+10.3.1
diff --git a/config/config.php b/config/config.php
index b03c82cd9e..5abb949b7f 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version    = '10.3';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version    = '10.3.1';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset    = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife = time() + 2592000;     // Cookie的生存时间。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/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php
index 82ce33904f..b6364d1c08 100644
--- a/module/testreport/lang/zh-tw.php
+++ b/module/testreport/lang/zh-tw.php
@@ -38,7 +38,7 @@ $lang->testreport->deleted     = '已刪除';
 $lang->testreport->legendBasic       = '基本信息';
 $lang->testreport->legendStoryAndBug = '測試範圍';
 $lang->testreport->legendBuild       = '測試輪次';
-$lang->testreport->legendCase        = '執行的用例';
+$lang->testreport->legendCase        = '關聯的用例';
 $lang->testreport->legendLegacyBugs  = '遺留的Bug';
 $lang->testreport->legendReport      = '報表';
 $lang->testreport->legendComment     = '總結';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 214322c162..634916415a 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -94,3 +94,4 @@ $lang->upgrade->fromVersions['10_0_beta']  = '10.0.beta';
 $lang->upgrade->fromVersions['10_0']       = '10.0';
 $lang->upgrade->fromVersions['10_1']       = '10.1';
 $lang->upgrade->fromVersions['10_2']       = '10.2';
+$lang->upgrade->fromVersions['10_3']       = '10.3';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 3c789dbe04..6dd73f45cc 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -232,6 +232,7 @@ class upgradeModel extends model
                 $xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql';
                 $this->execSQL($xuanxuanSql);
             case '10_2':
+            case '10_3':
         }
 
         $this->deletePatch();
@@ -345,6 +346,7 @@ class upgradeModel extends model
             case '10_0':       $confirmContent .= file_get_contents($this->getUpgradeFile('10.0'));
             case '10_1':       $confirmContent .= file_get_contents($this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql');
             case '10_2':
+            case '10_3':
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }