Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle

2017-05-05 14:55:22 +08:00
parent 1d116698c7 aef5c363d0
commit 529d52f39a
1 changed files with 3 additions and 1 deletions
@@ -700,7 +700,9 @@ abstract class format_base {
            if (isset($option['type'])) {
                $mform->setType($optionname, $option['type']);
            }
-            if (is_null($mform->getElementValue('id')) && isset($option['default'])) {
+            if (isset($option['default']) && !array_key_exists($optionname, $mform->_defaultValues)) {
+                // Set defaults for the elements in the form.
+                // Since we call this method after set_data() make sure that we don't override what was already set.
                $mform->setDefault($optionname, $option['default']);
            }
        }