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

Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle

Browse source
This commit is contained in:
Jun Pataleta 2017-08-29 14:48:04 +08:00
commit 33b46e54bb
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,6 +106,7 @@ class combined_document {
case \core_files\conversion::STATUS_IN_PROGRESS:
case \core_files\conversion::STATUS_PENDING:
$pending = true;
break;
case \core_files\conversion::STATUS_FAILED:
return self::STATUS_FAILED;