Merge branch 'master_MDL-41144' of git://github.com/danmarsden/moodle

Mrmoodle · Aug 20, 2013 · 1ef7722 · 1ef7722
2 parents b89fbc4 + a4aaeea
commit 1ef7722
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/enrol/flatfile/lib.php b/enrol/flatfile/lib.php
@@ -311,8 +311,8 @@ protected function process_file(progress_trace $trace) {
                 }
                 $roleid = $rolemap[$fields[1]];
 
-                if (empty($fields[2]) or !$user = $DB->get_record("user", array("idnumber"=>$fields[2]))) {
-                    $trace->output("Unknown user idnumber in field 3 - ignoring line $line", 1);
+                if (empty($fields[2]) or !$user = $DB->get_record("user", array("idnumber"=>$fields[2], 'deleted'=>0))) {
+                    $trace->output("Unknown user idnumber or deleted user in field 3 - ignoring line $line", 1);
                     continue;
                 }