MDL-22078 course reset: No enddate time shift if no enddate

2016-10-06 10:07:22 +08:00
parent 21d8921112
commit 40eea06c7d
1 changed files with 2 additions and 2 deletions
@@ -188,8 +188,8 @@ class course_reset_form extends moodleform {
        if ($data['reset_end_date'] != 0) {
            // End date set by the user has preference.
            $coursedata['enddate'] = $data['reset_end_date'];
-        } else if ($data['reset_start_date'] > 0) {
-            // Otherwise reset_course_userdata will add the start date time shift.
+        } else if ($data['reset_start_date'] > 0 && $course->enddate != 0) {
+            // Otherwise, if the current course enddate is set, reset_course_userdata will add the start date time shift to it.
            $timeshift = $data['reset_start_date'] - usergetmidnight($course->startdate);
            $coursedata['enddate'] = $course->enddate + $timeshift;
        } else {