Skip to content
Browse files

Merge branch 'm24_MDL-38468_Fix_MHTML_files_delivery' of https://gith…

…ub.com/scara/moodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents fe33e80 + 9992ee7 commit 11ba99ea72d58c1f2d145e2480312d1a2e4d490b @damyon damyon committed Mar 26, 2013
Showing with 19 additions and 1 deletion.
  1. +16 −0 lib/db/upgrade.php
  2. +2 −0 lib/filelib.php
  3. +1 −1 version.php
View
16 lib/db/upgrade.php
@@ -1671,5 +1671,21 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012120302.01);
}
+ if ($oldversion < 2012120303.02) {
+ // Fixing possible wrong MIME type for MIME HTML (MHTML) files.
+ $extensions = array('%.mht', '%.mhtml');
+ $select = $DB->sql_like('filename', '?', false);
+ foreach ($extensions as $extension) {
+ $DB->set_field_select(
+ 'files',
+ 'mimetype',
+ 'message/rfc822',
+ $select,
+ array($extension)
+ );
+ }
+ upgrade_main_savepoint(true, 2012120303.02);
+ }
+
return true;
}
View
2 lib/filelib.php
@@ -1500,6 +1500,8 @@ function &get_mimetypes_array() {
'mp4' => array ('type'=>'video/mp4', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
'm4v' => array ('type'=>'video/mp4', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
'm4a' => array ('type'=>'audio/mp4', 'icon'=>'mp3', 'groups'=>array('audio'), 'string'=>'audio'),
+ 'mht' => array ('type'=>'message/rfc822', 'icon'=>'archive'),
+ 'mhtml'=> array ('type'=>'message/rfc822', 'icon'=>'archive'),
'mpeg' => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
'mpe' => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
'mpg' => array ('type'=>'video/mpeg', 'icon'=>'mpeg', 'groups'=>array('video','web_video'), 'string'=>'video'),
View
2 version.php
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2012120303.01; // 20121203 = branching date YYYYMMDD - do not modify!
+$version = 2012120303.02; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes

0 comments on commit 11ba99e

Please sign in to comment.
Something went wrong with that request. Please try again.