From 4fe474fad4bde9e5937c9d81b79cef12e6d4c8a2 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Tue, 15 Mar 2022 17:39:04 +0800
Subject: [PATCH] MDL-74088 assign: backup and restore support for time limit
 fields

---
 mod/assign/backup/moodle2/backup_assign_stepslib.php  | 9 ++++++---
 mod/assign/backup/moodle2/restore_assign_stepslib.php | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mod/assign/backup/moodle2/backup_assign_stepslib.php b/mod/assign/backup/moodle2/backup_assign_stepslib.php
index f05ad0ff981..bb27e848c77 100644
--- a/mod/assign/backup/moodle2/backup_assign_stepslib.php
+++ b/mod/assign/backup/moodle2/backup_assign_stepslib.php
@@ -75,7 +75,6 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st
                                                   'sendstudentnotifications',
                                                   'duedate',
                                                   'cutoffdate',
-                                                  'timelimit',
                                                   'gradingduedate',
                                                   'allowsubmissionsfromdate',
                                                   'grade',
@@ -92,7 +91,11 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st
                                                   'maxattempts',
                                                   'markingworkflow',
                                                   'markingallocation',
-                                                  'preventsubmissionnotingroup'));
+                                                  'preventsubmissionnotingroup',
+                                                  'activity',
+                                                  'activityformat',
+                                                  'timelimit',
+                                                  'submissionattachments'));
 
         $userflags = new backup_nested_element('userflags');
 
@@ -137,7 +140,7 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st
 
         $overrides = new backup_nested_element('overrides');
         $override = new backup_nested_element('override', array('id'), array(
-            'groupid', 'userid', 'sortorder', 'allowsubmissionsfromdate', 'duedate', 'cutoffdate'));
+            'groupid', 'userid', 'sortorder', 'allowsubmissionsfromdate', 'duedate', 'cutoffdate', 'timelimit'));
 
         // Build the tree.
         $assign->add_child($userflags);
diff --git a/mod/assign/backup/moodle2/restore_assign_stepslib.php b/mod/assign/backup/moodle2/restore_assign_stepslib.php
index 45a0dd3d308..902090e5816 100644
--- a/mod/assign/backup/moodle2/restore_assign_stepslib.php
+++ b/mod/assign/backup/moodle2/restore_assign_stepslib.php
@@ -111,10 +111,6 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
         } else {
             $data->teamsubmissiongroupingid = 0;
         }
-
-        if (!isset($data->timelimit)) {
-            $data->timelimit = 0;
-        }
         if (!isset($data->cutoffdate)) {
             $data->cutoffdate = 0;
         }