From 40eea06c7da5f3d2146cf9c289304fc7eb3d75cb Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 6 Oct 2016 10:07:22 +0800 Subject: [PATCH] MDL-22078 course reset: No enddate time shift if no enddate --- course/reset_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/course/reset_form.php b/course/reset_form.php index 5e8623f0434..6314a16b186 100644 --- a/course/reset_form.php +++ b/course/reset_form.php @@ -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 {