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

Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-11-26 09:22:56 +00:00
commit 7bd780835b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/tool/uploadcourse/classes/helper.php
View File

@ -164,7 +164,10 @@ class tool_uploadcourse_helper {
if (!empty($enrolmethods)) {
$enrolmentplugins = self::get_enrolment_plugins();
foreach ($enrolmethods as $key => $method) {
if (!array_key_exists($method, $enrolmentplugins)) {
if (empty($method)) {
// The enrolment method is not specified, we skip it.
continue;
} else if (!array_key_exists($method, $enrolmentplugins)) {
// Unknown enrolment method.
$unknownmethods[] = $method;
continue;

1
admin/tool/uploadcourse/tests/helper_test.php
View File

@ -79,6 +79,7 @@ class tool_uploadcourse_helper_testcase extends advanced_testcase {
'enrolment_5_test2' => 'test2',
'enrolment_5_test1' => 'test1',
'enrolment_5' => 'flatfile',
'enrolment_6' => '',
);
$expected = array(
'self' => array(