L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-60319-MOODLE_33-google-converter-bug' of https://github.com/mspall/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2017-10-19 11:29:20 +08:00
parent f4307218e6 52d65d0970
commit 6475e2cb5e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
files/converter/googledrive/classes/converter.php
+3 -2
View File
@@ -47,7 +47,8 @@ class converter implements \core_files\converter_interface {
'xls' => 'application/vnd.google-apps.spreadsheet',
'xlsx' => 'application/vnd.google-apps.spreadsheet',
'ppt' => 'application/vnd.google-apps.presentation',
'pptx' => 'application/vnd.google-apps.presentation'
'pptx' => 'application/vnd.google-apps.presentation',
'html' => 'application/vnd.google-apps.document'
];
/** @var array $export List of supported export file formats */
@@ -265,6 +266,6 @@ class converter implements \core_files\converter_interface {
* @return string
*/
public function get_supported_conversions() {
return implode(', ', ['rtf', 'doc', 'xls', 'docx', 'xlsx', 'ppt', 'pptx', 'pdf']);
return implode(', ', ['rtf', 'doc', 'xls', 'docx', 'xlsx', 'ppt', 'pptx', 'pdf', 'html']);
}
}