From: martinlanghoff <martinlanghoff>
Date: Sun, 9 Jan 2005 21:54:48 +0000 (+0000)
Subject: Ported from MOODLE_14_STABLE. SC#62 - Prevent database values from overriding $CFG... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=27a0c5f6082c16a1f907567d559717421b41c712;p=moodle.git

Ported from MOODLE_14_STABLE. SC#62 - Prevent database values from overriding $CFG values defined in config.php -- Credits go to Petr Skoda.
---

diff --git a/lib/setup.php b/lib/setup.php
index f6a84f2c3b..cabc270f3f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -134,7 +134,9 @@ global $THEME;
     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;