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

Merge branch release/21.7.8 of zentao/zentaopms (#12829)

Browse Source
This commit is contained in:
刘刚
2025-12-15 11:00:37 +08:00
committed by Gitfox
parent a36e30f16b 05b310cdc1
commit acdaff5315
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 = '21.7.7'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '21.7.8'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
module/upgrade/config.php
+6 -3
View File
@@ -74,7 +74,8 @@ $config->upgrade->maxVersion['max7_2'] = '21_7_3';
$config->upgrade->maxVersion['max7_3'] = '21_7_4';
$config->upgrade->maxVersion['max7_4'] = '21_7_5';
$config->upgrade->maxVersion['max7_5'] = '21_7_6';
$config->upgrade->maxVersion['max7_6'] = '21_7_7'; // max insert position.
$config->upgrade->maxVersion['max7_6'] = '21_7_7';
$config->upgrade->maxVersion['max7_7'] = '21_7_8'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -187,7 +188,8 @@ $config->upgrade->bizVersion['biz12_2'] = '21_7_3';
$config->upgrade->bizVersion['biz12_3'] = '21_7_4';
$config->upgrade->bizVersion['biz12_4'] = '21_7_5';
$config->upgrade->bizVersion['biz12_5'] = '21_7_6';
$config->upgrade->bizVersion['biz12_6'] = '21_7_7'; // biz insert position.
$config->upgrade->bizVersion['biz12_6'] = '21_7_7';
$config->upgrade->bizVersion['biz12_7'] = '21_7_8'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
@@ -337,7 +339,8 @@ $config->upgrade->ipdVersion['ipd4_2'] = '21_7_3';
$config->upgrade->ipdVersion['ipd4_3'] = '21_7_4';
$config->upgrade->ipdVersion['ipd4_4'] = '21_7_5';
$config->upgrade->ipdVersion['ipd4_5'] = '21_7_6';
$config->upgrade->ipdVersion['ipd4_6'] = '21_7_7'; // ipd insert position.
$config->upgrade->ipdVersion['ipd4_6'] = '21_7_7';
$config->upgrade->ipdVersion['ipd4_7'] = '21_7_8'; // ipd insert position.
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
module/upgrade/lang/version.php
+8 -4
View File
@@ -219,7 +219,8 @@ $lang->upgrade->fromVersions['21_7_3'] = '21.7.3';
$lang->upgrade->fromVersions['21_7_4'] = '21.7.4';
$lang->upgrade->fromVersions['21_7_5'] = '21.7.5';
$lang->upgrade->fromVersions['21_7_6'] = '21.7.6';
$lang->upgrade->fromVersions['21_7_7'] = '21.7.7'; // pms insert position.
$lang->upgrade->fromVersions['21_7_7'] = '21.7.7';
$lang->upgrade->fromVersions['21_7_8'] = '21.7.8'; // pms insert position.
global $config;
/* Lite. */
@@ -440,7 +441,8 @@ $lang->upgrade->fromVersions['biz12_3'] = 'Biz12.3';
$lang->upgrade->fromVersions['biz12_4'] = 'Biz12.4';
$lang->upgrade->fromVersions['biz12_4'] = 'Biz12.4';
$lang->upgrade->fromVersions['biz12_5'] = 'Biz12.5';
$lang->upgrade->fromVersions['biz12_6'] = 'Biz12.6'; // biz insert position.
$lang->upgrade->fromVersions['biz12_6'] = 'Biz12.6';
$lang->upgrade->fromVersions['biz12_7'] = 'Biz12.7'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -519,7 +521,8 @@ $lang->upgrade->fromVersions['max7_3'] = 'Max7.3';
$lang->upgrade->fromVersions['max7_4'] = 'Max7.4';
$lang->upgrade->fromVersions['max7_4'] = 'Max7.4';
$lang->upgrade->fromVersions['max7_5'] = 'Max7.5';
$lang->upgrade->fromVersions['max7_6'] = 'Max7.6'; // max insert position.
$lang->upgrade->fromVersions['max7_6'] = 'Max7.6';
$lang->upgrade->fromVersions['max7_7'] = 'Max7.7'; // max insert position.
/* Ipd */
$lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';
@@ -559,4 +562,5 @@ $lang->upgrade->fromVersions['ipd4_2'] = 'Ipd4.2';
$lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3';
$lang->upgrade->fromVersions['ipd4_3'] = 'Ipd4.3';
$lang->upgrade->fromVersions['ipd4_4'] = 'Ipd4.4';
$lang->upgrade->fromVersions['ipd4_5'] = 'Ipd4.5'; // ipd insert position.
$lang->upgrade->fromVersions['ipd4_5'] = 'Ipd4.5';
$lang->upgrade->fromVersions['ipd4_6'] = 'Ipd4.6'; // ipd insert position.