Changeset 16313 for trunk/install

Timestamp:

Jul 3, 2012, 12:28:50 AM (12 years ago)

Author:

plg

Message:

merge r16312 from branch 2.4 to trunk

bug 2677 fixed: smarter check of the database version and manage partial upgrade.

File:

• trunk/install/upgrade_2.3.0.php (modified) (2 diffs)

trunk/install/upgrade_2.3.0.php

@@ -53 +53 @@
 foreach ($to_apply as $upgrade_id)
 {
-  if ($upgrade_id >= 98)
+  if ($upgrade_id >= 112) // TODO change on each release
   {
     break;
@@ -84 +84 @@
 echo '<pre>';
 
-for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++)
+for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++) // TODO change on each release
 {
   if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
   {
-    break;
+    continue;
+  }
+
+  // maybe the upgrade task has already been applied in a previous and
+  // incomplete upgrade
+  if (in_array($upgrade_id, $applied))
+  {
+    continue;
   }