summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/common.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index e1936c015..f4c111454 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -765,7 +765,8 @@ function page_footer() {
}
}
-$config = conf_init();
+// Load configuration variables, overriding values set in conf.php
+$conf = variable_init(isset($conf) ? $conf : array());
unset($conf);