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

* fix the error of 1.0 stable version.

Browse Source
This commit is contained in:
wangchunsheng
2010-07-06 02:24:09 +00:00
parent 8a1bda8918
commit 9fe49f330f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/module/upgrade/lang/zh-cn.php
View File

@@ -50,5 +50,5 @@ $lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA';
$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA';
$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1';
$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2';
$lang->upgrade->fromVersions['1_0stable'] = '1.0 STABLE';
$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE';
$lang->upgrade->fromVersions['1_0_1'] = '1.0.1';

4
trunk/module/upgrade/model.php
View File

@@ -99,7 +99,7 @@ class upgradeModel extends model
$this->upgradeFrom1_0stableTo1_0_1();
$this->upgradeFrom1_0_1To1_1();
}
elseif($fromVersion == '1_0stable')
elseif($fromVersion == '1_0')
{
$this->upgradeFrom1_0stableTo1_0_1();
$this->upgradeFrom1_0_1To1_1();
@@ -161,7 +161,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1'));
}
elseif($fromVersion == '1_0stable' || $fromVersion == '1_0_1')
elseif($fromVersion == '1_0' || $fromVersion == '1_0_1')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1'));
}