Merge branch 'MDL-74088-master' of https://github.com/lameze/moodle
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user