- Patch by Bart: fixed update.php after bootstrap patch.

includes/bootstrap.inc

@@ -820,8 +820,8 @@ function _drupal_bootstrap($phase) {
 
   switch ($phase) {
     case 'database':
-      global $db_url, $base_url;
-      unset($conf);
+      global $db_url, $db_prefix, $base_url;
+      $conf = array();
       require_once conf_init() .'/settings.php';
       require_once './includes/database.inc';
       // Initialize the default database.

update.php

@@ -207,7 +207,7 @@ function update_info() {
 
 if (isset($_GET["op"])) {
   include_once "includes/bootstrap.inc";
-  include_once "includes/common.inc";
+  drupal_bootstrap('full');
 
   // Access check:
   if (($access_check == 0) || ($user->uid == 1)) {