diff --git a/trunk/module/upgrade/lang/zh-cn.php b/trunk/module/upgrade/lang/zh-cn.php index d36aeb2bb0..71d39d363b 100644 --- a/trunk/module/upgrade/lang/zh-cn.php +++ b/trunk/module/upgrade/lang/zh-cn.php @@ -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'; diff --git a/trunk/module/upgrade/model.php b/trunk/module/upgrade/model.php index 39601a657e..d61d63022a 100644 --- a/trunk/module/upgrade/model.php +++ b/trunk/module/upgrade/model.php @@ -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')); }