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

Merge branch 'w26_MDL-40254_m26_flatfile' of https://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-06-24 21:13:01 +02:00
commit 1d04b481dd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
enrol/flatfile/lib.php
View File

@ -311,7 +311,7 @@ class enrol_flatfile_plugin extends enrol_plugin {
}
$roleid = $rolemap[$fields[1]];
if (!$user = $DB->get_record("user", array("idnumber"=>$fields[2]))) {
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);
continue;
}

4
enrol/flatfile/tests/flatfile_test.php
View File

@ -88,6 +88,7 @@ class enrol_flatfile_testcase extends advanced_testcase {
$user4 = $this->getDataGenerator()->create_user(array('idnumber'=>'čtvrtý'));
$user5 = $this->getDataGenerator()->create_user(array('idnumber'=>'u5'));
$user6 = $this->getDataGenerator()->create_user(array('idnumber'=>'u6'));
$user7 = $this->getDataGenerator()->create_user(array('idnumber'=>''));
$course1 = $this->getDataGenerator()->create_course(array('idnumber'=>'c1'));
$course2 = $this->getDataGenerator()->create_course(array('idnumber'=>'c2'));
@ -124,7 +125,8 @@ class enrol_flatfile_testcase extends advanced_testcase {
add,student,u5,c2,20,10
add,student,u6,c1,0,$future
add,student,u6,c2,$future,0
add,student,u6,c3,$future,$farfuture";
add,student,u6,c3,$future,$farfuture
add,student,,c2";
file_put_contents($file, $data);
$this->assertEquals(0, $DB->count_records('user_enrolments'));