summaryrefslogtreecommitdiff
path: root/includes/bootstrap.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/bootstrap.inc')
-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';