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

…MCorz/moodle"

This reverts commit 7bd7808, reversing
changes made to 1e7e4d5.

admin/tool/uploadcourse/classes/helper.php

@@ -164,10 +164,7 @@ public static function get_enrolment_data($data, &$errors = array()) {
         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;

admin/tool/uploadcourse/tests/helper_test.php

@@ -79,7 +79,6 @@ public function test_get_enrolment_data() {
             'enrolment_5_test2' => 'test2',
             'enrolment_5_test1' => 'test1',
             'enrolment_5' => 'flatfile',
-            'enrolment_6' => '',
         );
         $expected = array(
             'self' => array(