Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle

2018-05-03 17:07:57 +08:00
parent 3128529784 23fe1e2bed
commit c166b700d8
1 changed files with 1 additions and 1 deletions
@@ -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.