From 0f052d1c35d74288d9a7488558207df8d0d84212 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 14 Jun 2023 18:35:28 +0100
Subject: [PATCH] MDL-78435 mod_assign: ensure due date is always after start
 date.

---
 mod/assign/lang/en/assign.php | 1 +
 mod/assign/mod_form.php       | 4 ++--
 mod/assign/override_form.php  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index 7f369dd22d9..32dd6c0bd6e 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -175,6 +175,7 @@ $string['submissionempty'] = 'Nothing was submitted';
 $string['submissionmodified'] = 'You have existing submission data. Please leave this page and try again.';
 $string['submissionmodifiedgroup'] = 'The submission has been modified by somebody else. Please leave this page and try again.';
 $string['duedatereached'] = 'The due date for this assignment has now passed';
+$string['duedateaftersubmissionvalidation'] = 'Due date must be after the allow submissions from date.';
 $string['duedatevalidation'] = 'Due date cannot be earlier than the allow submissions from date.';
 $string['editattemptfeedback'] = 'Edit the grade and feedback for attempt number {$a}.';
 $string['editonline'] = 'Edit online';
diff --git a/mod/assign/mod_form.php b/mod/assign/mod_form.php
index 1ec86488d28..81e4f0c3c00 100644
--- a/mod/assign/mod_form.php
+++ b/mod/assign/mod_form.php
@@ -247,8 +247,8 @@ class mod_assign_mod_form extends moodleform_mod {
         $errors = parent::validation($data, $files);
 
         if (!empty($data['allowsubmissionsfromdate']) && !empty($data['duedate'])) {
-            if ($data['duedate'] < $data['allowsubmissionsfromdate']) {
-                $errors['duedate'] = get_string('duedatevalidation', 'assign');
+            if ($data['duedate'] <= $data['allowsubmissionsfromdate']) {
+                $errors['duedate'] = get_string('duedateaftersubmissionvalidation', 'assign');
             }
         }
         if (!empty($data['cutoffdate']) && !empty($data['duedate'])) {
diff --git a/mod/assign/override_form.php b/mod/assign/override_form.php
index f7a133cbb4c..87f76f629c6 100644
--- a/mod/assign/override_form.php
+++ b/mod/assign/override_form.php
@@ -324,8 +324,8 @@ class assign_override_form extends moodleform {
         }
 
         if (!empty($data['allowsubmissionsfromdate']) && !empty($data['duedate'])) {
-            if ($data['duedate'] < $data['allowsubmissionsfromdate']) {
-                $errors['duedate'] = get_string('duedatevalidation', 'assign');
+            if ($data['duedate'] <= $data['allowsubmissionsfromdate']) {
+                $errors['duedate'] = get_string('duedateaftersubmissionvalidation', 'assign');
             }
         }