Merge branch 'wip-MDL-40408-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

2017-07-10 14:36:54 +01:00
parent e635e8d6fd d2a5e259b7
commit 807a0908fa
1 changed files with 6 additions and 1 deletions
@@ -114,9 +114,14 @@ if (!$formdata = $form->get_data()) {
        $rawfields = $DB->get_records('data_fields', array('dataid' => $data->id), '', 'name, id, type');
        $fields = array();
        $errorfield = '';
+        $safetoskipfields = array(get_string('user'), get_string('username'), get_string('email'),
+            get_string('timeadded', 'data'), get_string('timemodified', 'data'),
+            get_string('approved', 'data'));
        foreach ($fieldnames as $name => $id) {
            if (!isset($rawfields[$name])) {
-                $errorfield .= "'$name' ";
+                if (!in_array($name, $safetoskipfields)) {
+                    $errorfield .= "'$name' ";
+                }
            } else {
                $field = $rawfields[$name];
                require_once("$CFG->dirroot/mod/data/field/$field->type/field.class.php");