From 5de740d89bbd839b2cd01152cd190f555574a7dc Mon Sep 17 00:00:00 2001 From: martinlanghoff Date: Sun, 9 Jan 2005 21:53:25 +0000 Subject: [PATCH] SC#62 - Prevent database values from overriding $CFG values defined in config.php -- Credits go to Petr Skoda. --- lib/setup.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/setup.php b/lib/setup.php index d472d5248ca..22a17f1705e 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -79,7 +79,9 @@ if ($configs = get_records('config')) { $CFG = (array)$CFG; foreach ($configs as $config) { - $CFG[$config->name] = $config->value; + if (!isset($CFG[$config->name])) { + $CFG[$config->name] = $config->value; + } } $CFG = (object)$CFG; unset($configs);