Merge branch 'MDL-78541/401' of https://github.com/skodak/moodle into MOODLE_401_STABLE

This commit is contained in:
Andrew Nicols 2023-06-22 10:09:32 +08:00 committed by Sara Arjona
commit fd87f7b46d

View File

@ -8916,6 +8916,10 @@ function admin_apply_default_settings($node=null, $unconditional=true, $admindef
} else if ($node instanceof admin_settingpage) {
foreach ($node->settings as $setting) {
if ($setting->nosave) {
// Not a real setting, must be a heading or description.
continue;
}
if (!$unconditional && !is_null($setting->get_setting())) {
// Do not override existing defaults.
continue;