summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-10-20 11:59:34 +0000
committerKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-10-20 11:59:34 +0000
commit0b323c0d8a9a7c3c33df92fcd5c98af7d5ea8567 (patch)
tree3ee7897df1ef7e115970cb69743aa7d1a207244d
parented8d88435ead39f44b8f3b0f2224f48b8b0963a7 (diff)
downloadbrdo-0b323c0d8a9a7c3c33df92fcd5c98af7d5ea8567.tar.gz
brdo-0b323c0d8a9a7c3c33df92fcd5c98af7d5ea8567.tar.bz2
- applying patch from Ax. Bug #389:
"Notice: Undefined variable: conf" in common.inc on line 779
-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);