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

This reverts commit 7bd780835b2e9ff8002da218a5ca42de8dc321b4, reversing
changes made to 1e7e4d5f01c7eaa2278aa38f8abd8c04197d51cc.
This commit is contained in:
Dan Poltawski 2014-11-27 09:33:48 +00:00
parent e7087cb4c6
commit e6f5a4b268
2 changed files with 1 additions and 5 deletions

View File

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

View File

@ -79,7 +79,6 @@ 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(