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

davidknu · Oct 6, 2016 · 40eea06 · 40eea06
1 parent 21d8921
commit 40eea06
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/course/reset_form.php b/course/reset_form.php
@@ -188,8 +188,8 @@ public function validation($data, $files) {
         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 {