Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for upgrade.

Browse Source
This commit is contained in:
wangyidong
2018-08-02 10:02:21 +08:00
parent 4c6c3f461f
commit 90945e3bd7
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
10.1.stable
10.2.stable
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '10.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '10.2'; // 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.
module/upgrade/lang/version.php
+1
View File
@@ -92,3 +92,4 @@ $lang->upgrade->fromVersions['9_8_3'] = '9.8.3';
$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha';
$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta';
$lang->upgrade->fromVersions['10_0'] = '10.0';
$lang->upgrade->fromVersions['10_1'] = '10.1';
module/upgrade/model.php
+4
View File
@@ -228,6 +228,9 @@ class upgradeModel extends model
$this->execSQL($this->getUpgradeFile('10.0'));
$this->fixStorySpecTitle();
$this->removeUnlinkPriv();//Remove unlink privilege for story, bug and testcase module.
case '10_1':
$xuanxuanSql = $this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql';
$this->execSQL($xuanxuanSql);
}
$this->deletePatch();
@@ -339,6 +342,7 @@ class upgradeModel extends model
case '10_0_alpha': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.alpha'));
case '10_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.beta'));
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');
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}