From 0b323c0d8a9a7c3c33df92fcd5c98af7d5ea8567 Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Sun, 20 Oct 2002 11:59:34 +0000
Subject: - applying patch from Ax. Bug #389:  "Notice: Undefined variable:
 conf" in common.inc on line 779

---
 includes/common.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes/common.inc')

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);
 
-- 
cgit v1.2.3