summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2006-04-12 21:39:15 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2006-04-12 21:39:15 +0000
commitbfb407601b73ccd6fbe79481dcc49517fcbdbe67 (patch)
treea951909d6a6ebea1a95dcf2feb1adbfca1f5839e
parent8ebf819ac279155946e429eb844a29f8e1b035ee (diff)
downloadbrdo-bfb407601b73ccd6fbe79481dcc49517fcbdbe67.tar.gz
brdo-bfb407601b73ccd6fbe79481dcc49517fcbdbe67.tar.bz2
#58418: $conf ignored after bootstrap patch
-rw-r--r--includes/bootstrap.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index b722d15a0..15d2ba52d 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -135,7 +135,7 @@ function conf_path() {
* Loads the configuration and sets the base URL correctly.
*/
function conf_init() {
- global $db_url, $db_prefix, $base_url, $base_path, $base_root;
+ global $db_url, $db_prefix, $base_url, $base_path, $base_root, $conf;
$conf = array();
require_once './'. conf_path() .'/settings.php';