summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-04-24 10:45:20 +0000
committerDries Buytaert <dries@buytaert.net>2007-04-24 10:45:20 +0000
commitdf1bea8bca2fad131b22428832f5334624968b02 (patch)
tree07fcf9a31e59333dd7f28958d8d289d262f31ac7
parent2e34699b5926d0b3d3c9b22a4dd76ce976dc04bd (diff)
downloadbrdo-df1bea8bca2fad131b22428832f5334624968b02.tar.gz
brdo-df1bea8bca2fad131b22428832f5334624968b02.tar.bz2
- Patch #138429: reroll.
-rw-r--r--includes/bootstrap.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index aa5320867..c93f2a81c 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -259,6 +259,10 @@ function drupal_unset_globals() {
function conf_init() {
global $base_url, $base_path, $base_root;
+ // Export the following settings.php variables to the global namespace
+ global $db_url, $db_prefix, $conf, $installed_profile;
+ $conf = array();
+
include_once './'. conf_path() .'/settings.php';
if (isset($base_url)) {