Merge branch 'MDL-69106-master' of git.in.moodle.com:cameron/moodle

This commit is contained in:
Andrew Nicols 2020-07-07 14:13:22 +08:00
commit 877a3f70d0

View File

@ -98,6 +98,7 @@ class convert_submissions extends scheduled_task {
}
mtrace('Convert ' . count($users) . ' submission attempt(s) for assignment ' . $assignmentid);
$conversionrequirespolling = false;
foreach ($users as $userid) {
try {
@ -107,6 +108,7 @@ class convert_submissions extends scheduled_task {
case combined_document::STATUS_READY_PARTIAL:
case combined_document::STATUS_PENDING_INPUT:
// The document has not been converted yet or is somehow still ready.
$conversionrequirespolling = true;
continue 2;
}
document_services::get_page_images_for_attempt(
@ -127,7 +129,9 @@ class convert_submissions extends scheduled_task {
}
// Remove from queue.
$DB->delete_records('assignfeedback_editpdf_queue', array('id' => $record->id));
if (!$conversionrequirespolling) {
$DB->delete_records('assignfeedback_editpdf_queue', array('id' => $record->id));
}
}
}