diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-03-03 14:23:48 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-03-03 14:23:48 -0800 |
| commit | e77276736351700b3bbd1080369738620ff8be28 (patch) | |
| tree | 16c59ebe667754990fadc6ff8428c359c6d8fba3 /modules/gallery/helpers/legal_file.php | |
| parent | 8d05571fa3314dc1b7c3abc4e8e20d8bd4886109 (diff) | |
| parent | e7b224461a4137666f97eb23c063bbb2bf5fdc7a (diff) | |
Merge pull request #179 from shadlaws/fix_2034
#2034 - Add webm and ogv as valid movie types.
Diffstat (limited to 'modules/gallery/helpers/legal_file.php')
| -rw-r--r-- | modules/gallery/helpers/legal_file.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php index eb9c25de..f8547011 100644 --- a/modules/gallery/helpers/legal_file.php +++ b/modules/gallery/helpers/legal_file.php @@ -70,7 +70,8 @@ class legal_file_Core { if (empty(self::$movie_types_by_extension)) { $types_by_extension_wrapper = new stdClass(); $types_by_extension_wrapper->types_by_extension = array( - "flv" => "video/x-flv", "mp4" => "video/mp4", "m4v" => "video/x-m4v"); + "flv" => "video/x-flv", "mp4" => "video/mp4", "m4v" => "video/x-m4v", + "webm" => "video/webm", "ogv" => "video/ogg"); module::event("movie_types_by_extension", $types_by_extension_wrapper); foreach (self::$blacklist as $key) { unset($types_by_extension_wrapper->types_by_extension[$key]); |