summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/bootstrap.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 1a5fca334..aa5320867 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -257,8 +257,8 @@ function drupal_unset_globals() {
* Loads the configuration and sets the base URL correctly.
*/
function conf_init() {
- global $db_url, $db_prefix, $base_url, $base_path, $base_root, $conf, $installed_profile;
- $conf = array();
+ global $base_url, $base_path, $base_root;
+
include_once './'. conf_path() .'/settings.php';
if (isset($base_url)) {