summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-07-03 10:09:08 +0000
committerDries Buytaert <dries@buytaert.net>2005-07-03 10:09:08 +0000
commitfac840fe8680dceff91e9a73d359037e2f755297 (patch)
tree20029edc5974d5ab5b71796e1f193b627be2adf5 /includes
parentdb3a2cc175a0e77a1ed8e5bbd63e5710b35d2c09 (diff)
downloadbrdo-fac840fe8680dceff91e9a73d359037e2f755297.tar.gz
brdo-fac840fe8680dceff91e9a73d359037e2f755297.tar.bz2
- Patch by Bart: fixed update.php after bootstrap patch.
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 761952068..4db35b208 100644
--- a/includes/bootstrap.inc
+++ b/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.