Merge branch 'MDL-42618_25' of git://github.com/SWiT/moodle into MOODLE_25_STABLE

2014-02-17 12:14:21 +08:00
parent 392c600873 a94d76da9d
commit 13628d19a8
1 changed files with 1 additions and 1 deletions
@@ -235,7 +235,7 @@ if ($formdata = $mform2->get_data()) {
                    $studentid = $value;
                break;
                case 'useridnumber':
-                    if (!$user = $DB->get_record('user', array('idnumber' => $value))) {
+                    if (empty($value) || !$user = $DB->get_record('user', array('idnumber' => $value))) {
                         // user not found, abort whole import
                        import_cleanup($importcode);
                        echo $OUTPUT->notification("user mapping error, could not find user with idnumber \"$value\"");