moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-63422' of git://github.com/stronk7/moodle

Browse source
This commit is contained in:
Andrew Nicols 2018-11-02 08:22:33 +08:00
commit f8e364e31a
27 changed files with 79 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/assign/feedback/editpdf/classes/combined_document.php
View file

@ -187,7 +187,7 @@ class combined_document {
$status = $file->get('status');
switch ($status) {
case \core_files\conversion::STATUS_COMPLETE:
continue;
continue 2;
break;
default:
$converter->poll_conversion($conversion);

2
mod/assign/feedback/editpdf/classes/task/convert_submissions.php
View file

@ -108,7 +108,7 @@ class convert_submissions extends scheduled_task {
case combined_document::STATUS_READY:
case combined_document::STATUS_PENDING_INPUT:
// The document has not been converted yet or is somehow still ready.
continue;
continue 2;
}
document_services::get_page_images_for_attempt(
$assignment,

5
mod/assign/lib.php
View file

@ -534,10 +534,9 @@ function mod_assign_get_completion_active_rule_descriptions($cm) {
foreach ($cm->customdata['customcompletionrules'] as $key => $val) {
switch ($key) {
case 'completionsubmit':
if (empty($val)) {
continue;
if (!empty($val)) {
$descriptions[] = get_string('completionsubmit', 'assign');
}
$descriptions[] = get_string('completionsubmit', 'assign');
break;
default:
break;