diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-07-03 10:09:08 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-07-03 10:09:08 +0000 |
| commit | fac840fe8680dceff91e9a73d359037e2f755297 (patch) | |
| tree | 20029edc5974d5ab5b71796e1f193b627be2adf5 | |
| parent | db3a2cc175a0e77a1ed8e5bbd63e5710b35d2c09 (diff) | |
| download | brdo-fac840fe8680dceff91e9a73d359037e2f755297.tar.gz brdo-fac840fe8680dceff91e9a73d359037e2f755297.tar.bz2 | |
- Patch by Bart: fixed update.php after bootstrap patch.
| -rw-r--r-- | includes/bootstrap.inc | 4 | ||||
| -rw-r--r-- | update.php | 2 |
2 files changed, 3 insertions, 3 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. diff --git a/update.php b/update.php index aae141d4c..90eace13b 100644 --- a/update.php +++ b/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)) { |