Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.147
diff -u -F^function -r1.147 update.php
--- update.php	6 Apr 2005 19:04:02 -0000	1.147
+++ update.php	30 Jun 2005 14:38:04 -0000
@@ -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)) {
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.54
diff -u -F^function -r1.54 bootstrap.inc
--- includes/bootstrap.inc	27 Jun 2005 18:38:46 -0000	1.54
+++ includes/bootstrap.inc	30 Jun 2005 14:38:04 -0000
@@ -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.
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.456
diff -u -F^f -r1.456 common.inc
--- includes/common.inc	22 Jun 2005 20:19:57 -0000	1.456
+++ includes/common.inc	30 Jun 2005 14:55:44 -0000
@@ -2063,7 +2063,6 @@ function _drupal_bootstrap_full() {
   require_once './includes/menu.inc';
   require_once './includes/tablesort.inc';
   require_once './includes/file.inc';
-  require_once './includes/xmlrpc.inc';
   require_once './includes/image.inc';
   // Set the Drupal custom error handler.
   set_error_handler('error_handler');
Index: modules/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi.module,v
retrieving revision 1.44
diff -u -F^f -r1.44 blogapi.module
--- modules/blogapi.module	6 Jun 2005 18:59:37 -0000	1.44
+++ modules/blogapi.module	30 Jun 2005 14:55:45 -0000
@@ -1,6 +1,8 @@
 <?php
 // $Id: blogapi.module,v 1.44 2005/06/06 18:59:37 dries Exp $
 
+include_once('./includes/xmlrpc.inc');
+
 /**
  * @file
  * Enable users to post using applications that support XML-RPC blog APIs.
Index: modules/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal.module,v
retrieving revision 1.104
diff -u -F^f -r1.104 drupal.module
--- modules/drupal.module	27 Jun 2005 19:33:29 -0000	1.104
+++ modules/drupal.module	30 Jun 2005 14:55:45 -0000
@@ -1,6 +1,8 @@
 <?php
 // $Id: drupal.module,v 1.104 2005/06/27 19:33:29 dries Exp $
 
+include_once('./includes/xmlrpc.inc');
+
 /**
  * @file
  * Lets users log in using a Drupal ID and can notify a central server about your site.