mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2017-07-10 14:36:40 +01:00
commit 54ef4a9f36
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/data/import.php
View File

@ -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");