Commit 10cc00b4 authored by Andrew Nicols's avatar Andrew Nicols

Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle

parents 67c0e18c 46878ed8
......@@ -127,7 +127,7 @@ class converter {
if ($status === conversion::STATUS_PENDING || $status === conversion::STATUS_FAILED) {
// The current status is either pending or failed.
// Attempt to pick up a new converter and convert the document.
$from = \core_filetypes::get_file_extension($file->get_mimetype());
$from = pathinfo($file->get_filename(), PATHINFO_EXTENSION);
$converters = $this->get_document_converter_classes($from, $format);
$currentconverter = $this->get_next_converter($converters, $conversion->get('converter'));
......@@ -225,9 +225,9 @@ class converter {
return false;
}
$from = \core_filetypes::get_file_extension($file->get_mimetype());
$from = pathinfo($file->get_filename(), PATHINFO_EXTENSION);
if (!$from) {
// No mime type could be found. Unable to determine converter.
// No file extension could be found. Unable to determine converter.
return false;
}
......
......@@ -341,7 +341,7 @@ class core_files_converter_testcase extends advanced_testcase {
}
/**
* Test the can_convert_storedfile_to function with a file with indistinguished mimetype.
* Test the can_convert_storedfile_to function with a file with a known mimetype and extension.
*/
public function test_can_convert_storedfile_to_docx() {
$returnvalue = (object) [];
......@@ -352,8 +352,7 @@ class core_files_converter_testcase extends advanced_testcase {
$types = \core_filetypes::get_types();
// A file with filename '.' is a directory.
$file = $this->get_stored_file('example content', 'example', [
$file = $this->get_stored_file('example content', 'example.docx', [
'mimetype' => $types['docx']['type'],
]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment