From cfa5bd1f3f0fc24b3d7e08d61e7eda3dccec396a Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Tue, 26 Aug 2014 23:06:42 +0200 Subject: [PATCH] MDL-46985 Added 7-Zip and RAR MIME types. --- lib/db/upgrade.php | 9 +++++++++ lib/filelib.php | 2 ++ version.php | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 4a9c741a1c2..4efa633ab7e 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3734,5 +3734,14 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2014080801.00); } + if ($oldversion < 2014082900.01) { + // Fixing possible wrong MIME type for 7-zip and Rar files. + $filetypes = array( + '%.7z' => 'application/x-7z-compressed', + '%.rar' => 'application/x-rar-compressed'); + upgrade_mimetypes($filetypes); + upgrade_main_savepoint(true, 2014082900.01); + } + return true; } diff --git a/lib/filelib.php b/lib/filelib.php index 9450aba09db..bc55e11c03b 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -1389,6 +1389,7 @@ function &get_mimetypes_array() { static $mimearray = array ( 'xxx' => array ('type'=>'document/unknown', 'icon'=>'unknown'), '3gp' => array ('type'=>'video/quicktime', 'icon'=>'quicktime', 'groups'=>array('video'), 'string'=>'video'), + '7z' => array ('type'=>'application/x-7z-compressed', 'icon'=>'archive', 'groups'=>array('archive'), 'string'=>'archive'), 'aac' => array ('type'=>'audio/aac', 'icon'=>'audio', 'groups'=>array('audio'), 'string'=>'audio'), 'accdb' => array ('type'=>'application/msaccess', 'icon'=>'base'), 'ai' => array ('type'=>'application/postscript', 'icon'=>'eps', 'groups'=>array('image'), 'string'=>'image'), @@ -1523,6 +1524,7 @@ function &get_mimetypes_array() { 'qt' => array ('type'=>'video/quicktime', 'icon'=>'quicktime', 'groups'=>array('video','web_video'), 'string'=>'video'), 'ra' => array ('type'=>'audio/x-realaudio-plugin', 'icon'=>'audio', 'groups'=>array('audio','web_audio'), 'string'=>'audio'), 'ram' => array ('type'=>'audio/x-pn-realaudio-plugin', 'icon'=>'audio', 'groups'=>array('audio'), 'string'=>'audio'), + 'rar' => array ('type'=>'application/x-rar-compressed', 'icon'=>'archive', 'groups'=>array('archive'), 'string'=>'archive'), 'rhb' => array ('type'=>'text/xml', 'icon'=>'markup'), 'rm' => array ('type'=>'audio/x-pn-realaudio-plugin', 'icon'=>'audio', 'groups'=>array('audio'), 'string'=>'audio'), 'rmvb' => array ('type'=>'application/vnd.rn-realmedia-vbr', 'icon'=>'video', 'groups'=>array('video'), 'string'=>'video'), diff --git a/version.php b/version.php index 26f584e2743..f634452b6d8 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2014082900.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2014082900.01; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -- 2.11.4.GIT