MDL-16171 - Allow mdd/xxx/defaults.php to load data into the config_plugins table.

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 97f153aa53885e9ea2b9d5a1a71685cb0f2142ee..073de31931245810d9154b82a17237e7544799b4 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -685,9 +685,19 @@ function upgrade_activity_modules($return) {
             unset($defaults);
             include($fullmod .'/defaults.php'); // include here means execute, not library include
             if (!empty($defaults)) {
-                foreach ($defaults as $name => $value) {
-                    if (!isset($CFG->$name)) {
-                        set_config($name, $value);
+                if (!empty($defaults['_use_config_plugins'])) {
+                    unset($defaults['_use_config_plugins']);
+                    $localcfg = get_config($module->name);
+                    foreach ($defaults as $name => $value) {
+                        if (!isset($localcfg->$name)) {
+                            set_config($name, $value, $module->name);
+                        }
+                    }
+                } else {
+                    foreach ($defaults as $name => $value) {
+                        if (!isset($CFG->$name)) {
+                            set_config($name, $value);
+                        }
                     }
                 }
             }