Ported from MOODLE_14_STABLE. SC#62 - Prevent database values from overriding $CFG...

diff --git a/lib/setup.php b/lib/setup.php
index f6a84f2c3bf1b62e74b19f593ef02061778ab371..cabc270f3f1fc56cff806988b5d2bbd914b9e8ce 100644 (file)
--- 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;