Commit e92df62c authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Allowing video/x-ms-asf be a valid .wmv mimetype (Bug 1364609)"

parents 79a4aee9 c7acae36
...@@ -220,6 +220,14 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype { ...@@ -220,6 +220,14 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
foreach ($mimetypes as &$m) { foreach ($mimetypes as &$m) {
$m = $m->description; $m = $m->description;
} }
// Hack to allow .wmv and .wma files to also use the .asf mimetype as well
// See http://en.wikipedia.org/wiki/Advanced_Systems_Format
if (in_array('wmv', $data)) {
$mimetypes['video/x-ms-asf'] = 'wmv';
}
if (in_array('wma', $data)) {
$mimetypes['video/x-ms-asf'] = 'wma';
}
return $mimetypes; return $mimetypes;
} }
} }
......
...@@ -2780,6 +2780,7 @@ class ArtefactTypeVideo extends ArtefactTypeFile { ...@@ -2780,6 +2780,7 @@ class ArtefactTypeVideo extends ArtefactTypeFile {
'quicktime' => 'quicktime', 'quicktime' => 'quicktime',
'sgi_movie' => 'sgi_movie', 'sgi_movie' => 'sgi_movie',
'mp4_video' => 'mp4_video', 'mp4_video' => 'mp4_video',
'asf' => 'wmv',
); );
} }
return $descriptions; return $descriptions;
...@@ -2833,7 +2834,8 @@ class ArtefactTypeAudio extends ArtefactTypeFile { ...@@ -2833,7 +2834,8 @@ class ArtefactTypeAudio extends ArtefactTypeFile {
'ra', 'ra',
'au', 'au',
'aiff', 'aiff',
'm3u' 'm3u',
'asf',
); );
} }
return $descriptions; return $descriptions;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment