Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)
mod/assign/feedback/editpdf/classes/document_services.php

index 0920bbc..fa6dbfb 100644 (file)
@@ -188,7 +188,7 @@ EOD;
                         } else if ($convertedfile = $converter->start_conversion($file, 'pdf')) {
                             $files[$filename] = $convertedfile;
                         }
-                    } else {
+                    } else if ($converter->can_convert_format_to('html', 'pdf')) {
                         // Create a tmp stored_file from this html string.
                         $file = reset($file);
                         // Strip image tags, because they will not be resolvable.