From 66748a565c59f3850984f51815fe1fd2792a8dbf Mon Sep 17 00:00:00 2001 From: Krister Viirsaar Date: Wed, 30 Apr 2014 10:12:20 +0300 Subject: [PATCH] MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc --- lib/db/upgrade.php | 16 ++++++++++++++++ lib/filelib.php | 3 +++ version.php | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 591f669ce30..9e42894eeb7 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -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; } diff --git a/lib/filelib.php b/lib/filelib.php index 2d5946c5472..411cdcbe835 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -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'), diff --git a/version.php b/version.php index 764cf0177ed..47e8ef01139 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2013051405.09; // 20130514 = branching date YYYYMMDD - do not modify! +$version = 2013051405.10; // 20130514 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches // .XX = incremental changes