- Patch #68926 by chx, jeremy, steven, eaton, webchick, amazon, neil, nedjo et al: an initial install system for Drupal core.

1 files changed, 4 insertions, 2 deletions

diff --git a/update.php b/update.php
index 7390b273a..32d81be85 100644
--- a/update.php
+++ b/update.php
@@ -363,13 +363,14 @@ function update_selection_page() {
 
 function update_update_page() {
   // Set the installed version so updates start at the correct place.
-  $_SESSION['update_remaining'] = array();
+  // Ensure system.module's updates are run first by making it the first element.
+  $_SESSION['update_remaining'] = array('system' => '');
   foreach ($_POST['edit']['start'] as $module => $version) {
     drupal_set_installed_schema_version($module, $version - 1);
     $max_version = max(drupal_get_schema_versions($module));
     if ($version <= $max_version) {
       foreach (range($version, $max_version) as $update) {
-        $_SESSION['update_remaining'][] = array('module' => $module, 'version' => $update);
+        $_SESSION['update_remaining'][$module] = array('module' => $module, 'version' => $update);
       }
     }
   }
@@ -676,6 +677,7 @@ ini_set('display_errors', TRUE);
 // Access check:
 if (($access_check == FALSE) || ($user->uid == 1)) {
 
+  $install = FALSE;
   include_once './includes/install.inc';
 
   update_fix_schema_version();