Merged from MOODLE_14_STABLE. Issue a warning when overriding $CFG settings.

diff --git a/lib/setup.php b/lib/setup.php
index 020098807227258f7a506839b7749ff412825cc0..a934908a67b4ff0282e9831f9965a1ad2566a0d4 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -132,6 +132,8 @@ global $THEME;
         foreach ($configs as $config) {
             if (!isset($CFG[$config->name])) {
                 $CFG[$config->name] = $config->value;
+            } else {
+                error_log("\$CFG->$config->name in config.php overrides database setting");
             }
         }