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

Merge branch 'MDL-43570-M25' of https://github.com/KristerV/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2014-05-01 14:36:10 +08:00
parent d9dd21fd4e 66748a565c
commit 6a8ebfcd37
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+16
View File
@@ -2345,5 +2345,21 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013051404.04);
}
if ($oldversion < 2013051405.10) {
// Fixing possible wrong MIME type for DigiDoc files.
$extensions = array('%.bdoc', '%.cdoc', '%.ddoc');
$select = $DB->sql_like('filename', '?', false);
foreach ($extensions as $extension) {
$DB->set_field_select(
'files',
'mimetype',
'application/x-digidoc',
$select,
array($extension)
);
}
upgrade_main_savepoint(true, 2013051405.10);
}
return true;
}
lib/filelib.php
+3
View File
@@ -1454,6 +1454,9 @@ function &get_mimetypes_array() {
'dmg' => array ('type'=>'application/octet-stream', 'icon'=>'unknown'),
'doc' => array ('type'=>'application/msword', 'icon'=>'document', 'groups'=>array('document')),
'bdoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
'cdoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
'ddoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
'docx' => array ('type'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'icon'=>'document', 'groups'=>array('document')),
'docm' => array ('type'=>'application/vnd.ms-word.document.macroEnabled.12', 'icon'=>'document'),
'dotx' => array ('type'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'icon'=>'document'),