MDL-25936 fixed user upload when manual plugin not first

2011-01-12 22:07:48 +01:00
parent 5a7f931ee5
commit 4cb02426ff
1 changed files with 10 additions and 4 deletions
@@ -668,10 +668,16 @@ if ($formdata = $mform->is_cancelled()) {
            $courseid      = $ccache[$shortname]->id;
            $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid);
            if (!isset($manualcache[$courseid])) {
-                if ($instances = enrol_get_instances($courseid, false)) {
-                    $manualcache[$courseid] = reset($instances);
-                } else {
-                    $manualcache[$courseid] = false;
+                $manualcache[$courseid] = false;
+                if ($manual) {
+                    if ($instances = enrol_get_instances($courseid, false)) {
+                        foreach ($instances as $instance) {
+                            if ($instance->enrol === 'manual') {
+                                $manualcache[$courseid] = $instance;
+                                break;
+                            }
+                        }
+                    }
                }
            }