Merge branch 'MDL-57708-master' of git://github.com/merrill-oakland/moodle

2017-02-13 23:32:35 +01:00
parent a2c0fff9d1 7dfc65dbf9
commit 369df31150
1 changed files with 3 additions and 0 deletions
@@ -1031,6 +1031,9 @@ class assign_grading_table extends table_sql implements renderable {
        $due = $instance->duedate;
        if ($row->extensionduedate) {
            $due = $row->extensionduedate;
+        } else if (!empty($row->duedate)) {
+            // The override due date.
+            $due = $row->duedate;
        }

        $group = false;