+ upgrade to 3.1.

2012-05-02 11:57:25 +00:00
parent 277d7a0db8
commit a4b6edfe9e
3 changed files with 42 additions and 4 deletions
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -58,5 +58,6 @@ $lang->upgrade->fromVersions['2_1']       = '2.1';
 $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
-$lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
-$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';
+$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1';
+$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2';
+$lang->upgrade->fromVersions['3_0']       = '3.0 STABLE';
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -58,5 +58,6 @@ $lang->upgrade->fromVersions['2_1']       = '2.1';
 $lang->upgrade->fromVersions['2_2']       = '2.2';
 $lang->upgrade->fromVersions['2_3']       = '2.3';
 $lang->upgrade->fromVersions['2_4']       = '2.4';
-$lang->upgrade->fromVersions['3_0_beta1'] = '3.0.beta1';
-$lang->upgrade->fromVersions['3_0_beta2'] = '3.0.beta2';
+$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1';
+$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2';
+$lang->upgrade->fromVersions['3_0']       = '3.0 STABLE';
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -53,6 +53,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '0_4beta')
        {
@@ -76,6 +77,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '0_5beta')
        {
@@ -97,6 +99,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '0_6beta')
        {
@@ -117,6 +120,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_0beta')
        {
@@ -137,6 +141,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_0rc1')
        {
@@ -156,6 +161,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_0rc2')
        {
@@ -174,6 +180,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_0')
        {
@@ -191,6 +198,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_0_1')
        {
@@ -207,6 +215,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_1')
        {
@@ -222,6 +231,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_2')
        {
@@ -236,6 +246,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_3')
        {
@@ -249,6 +260,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_4')
        {
@@ -261,6 +273,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '1_5')
        {
@@ -272,6 +285,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '2_0')
        {
@@ -282,6 +296,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '2_1')
        {
@@ -291,6 +306,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '2_2')
        {
@@ -299,6 +315,7 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '2_3')
        {
@@ -306,21 +323,29 @@ class upgradeModel extends model
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '2_4')
        {
            $this->upgradeFrom2_4To3_0_beta1();
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '3_0_beta1')
        {
            $this->upgradeFrom3_0_beta1To3_0_beta2();
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
        }
        elseif($fromVersion == '3_0_beta2')
        {
            $this->upgradeFrom3_0_beta2To3_0_stable();
+            $this->upgradeFrom3_0To3_1();
+        }
+        elseif($fromVersion == '3_0')
+        {
+            $this->upgradeFrom3_0To3_1();
        }

        $this->deletePatch();
@@ -824,6 +849,17 @@ class upgradeModel extends model
        if(!$this->isError()) $this->setting->updateVersion('3.0.stable');
    }

+    /**
+     * Upgrade from 3.0 to 3.1.
+     * 
+     * @access public
+     * @return void
+     */
+    public function upgradeFrom3_0To3_1()
+    {
+        if(!$this->isError()) $this->setting->updateVersion('3.1');
+    }
+
    /**
     * Update company field.
     *