From 7d1c1fcc16c3de703eb1e1b01e6fa2b19ec9a3f8 Mon Sep 17 00:00:00 2001 From: Kjartan Mannes Date: Sun, 20 Oct 2002 19:17:17 +0000 Subject: . fixing what I did earlier. Not sure how that happend. --- includes/common.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/common.inc b/includes/common.inc index f4c111454..3e3460597 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -765,19 +765,18 @@ function page_footer() { } } -// Load configuration variables, overriding values set in conf.php -$conf = variable_init(isset($conf) ? $conf : array()); - unset($conf); +$config = conf_init(); + include_once "includes/$config.php"; include_once "includes/database.inc"; include_once "includes/xmlrpc.inc"; include_once "includes/module.inc"; include_once "includes/theme.inc"; -// initialize configuration variables: -$conf = variable_init($conf); +// initialize configuration variables, using values from conf.php if available: +$conf = variable_init(isset($conf) ? $conf : array()); // initialize installed modules: module_init(); -- cgit v1.2.3