Merge branch 'MDL-34647_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

2012-08-06 10:58:18 +12:00
parent f2ddce97bd 625aa8b043
commit f5543aa05e
1 changed files with 2 additions and 0 deletions
@@ -853,6 +853,8 @@ if ($formdata = $mform2->is_cancelled()) {
                        if ($duration > 0) { // sanity check
                            $timeend = $today + $duration;
                        }
+                    } else if ($manualcache[$courseid]->enrolperiod > 0) {
+                        $timeend = $today + $manualcache[$courseid]->enrolperiod;
                    }

                    $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend);