Merge branch 'm24_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE

This commit is contained in:
Sam Hemelryk
2013-08-21 10:59:34 +12:00
+2 -2
View File
@@ -121,8 +121,8 @@ class enrol_flatfile_plugin extends enrol_plugin {
continue;
}
if (! $user = $DB->get_record("user", array("idnumber"=>$fields[2]))) {
$this->log .= "Unknown user idnumber in field 3 - ignoring line\n";
if (! $user = $DB->get_record("user", array("idnumber"=>$fields[2], 'deleted'=>0))) {
$this->log .= "Unknown user idnumber or deleted user in field 3 - ignoring line\n";
continue;
}