diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 38deeed831..88707949af 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -48,3 +48,4 @@ $lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; $lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; $lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; $lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; +$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 6577613748..fe869ccb4e 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -82,6 +82,7 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); } elseif($fromVersion == '0_4beta') { @@ -89,21 +90,25 @@ class upgradeModel extends model $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); } elseif($fromVersion == '0_5beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.5')); $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); } elseif($fromVersion == '0_6beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('0.6')); $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); } elseif($fromVersion == '1_0beta') { $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.beta')); + $confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1')); } elseif($fromVersion == '1_0rc1') { @@ -151,7 +156,7 @@ class upgradeModel extends model } /* 从1.0rc1版本升级到1.0rc2版本。*/ - private function upgradeFrom1_0betaTo1_0rc2() + private function upgradeFrom1_0rc1To1_0rc2() { $this->execSQL($this->getUpgradeFile('1.0.rc1')); if(!$this->isError()) $this->updateVersion('1.0rc2'); diff --git a/module/upgrade/view/confirm.html.php b/module/upgrade/view/confirm.html.php index 7817655524..00cfc819c4 100644 --- a/module/upgrade/view/confirm.html.php +++ b/module/upgrade/view/confirm.html.php @@ -22,6 +22,7 @@ */ ?> +
'> diff --git a/module/upgrade/view/execute.html.php b/module/upgrade/view/execute.html.php index 1cf14bd814..c92312a72f 100644 --- a/module/upgrade/view/execute.html.php +++ b/module/upgrade/view/execute.html.php @@ -22,6 +22,7 @@ */ ?> +
diff --git a/module/upgrade/view/index.html.php b/module/upgrade/view/index.html.php index 9358580b6d..29673b8aab 100644 --- a/module/upgrade/view/index.html.php +++ b/module/upgrade/view/index.html.php @@ -22,6 +22,7 @@ */ ?> +
upgrade->$result;?>
diff --git a/module/upgrade/view/selectversion.html.php b/module/upgrade/view/selectversion.html.php index 42e5a296c2..8b64f065b9 100644 --- a/module/upgrade/view/selectversion.html.php +++ b/module/upgrade/view/selectversion.html.php @@ -22,6 +22,7 @@ */ ?> +
'>
upgrade->warnning;?>