diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-08-07 13:51:06 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-08-07 13:51:06 -0400 |
| commit | 44a8139aa801bc4d1c4ea3107483066c02489209 (patch) | |
| tree | 5d7f9957d61642be07b9f8820e7bfdde122e5dae | |
| parent | f6de4bcf77656f447f4171112d7fcc5d1f6b2e05 (diff) | |
| download | brdo-44a8139aa801bc4d1c4ea3107483066c02489209.tar.gz brdo-44a8139aa801bc4d1c4ea3107483066c02489209.tar.bz2 | |
- Patch #1239376 by Dave Reid: .ogg file extension incorrectly mapped to 'application/ogg' in file_default_mimetype_mapping().
| -rw-r--r-- | includes/file.mimetypes.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/file.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/includes/file.mimetypes.inc b/includes/file.mimetypes.inc index cda03fb92..8509433be 100644 --- a/includes/file.mimetypes.inc +++ b/includes/file.mimetypes.inc @@ -407,7 +407,6 @@ function file_default_mimetype_mapping() { 'doc' => 14, 'bin' => 15, 'oda' => 16, - 'ogg' => 17, 'ogx' => 17, 'pdf' => 18, 'key' => 19, @@ -629,6 +628,7 @@ function file_default_mimetype_mapping() { 'm4a' => 188, 'mp3' => 188, 'mp2' => 188, + 'ogg' => 189, 'oga' => 189, 'spx' => 189, 'sid' => 190, diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index 9dbe5464f..a84208c28 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -2618,6 +2618,7 @@ class FileMimeTypeTest extends DrupalWebTestCase { 'foo.file_test_1' => 'madeup/file_test_1', 'foo.file_test_2' => 'madeup/file_test_2', 'foo.doc' => 'madeup/doc', + 'test.ogg' => 'audio/ogg', ); // Test using default mappings. @@ -2656,6 +2657,7 @@ class FileMimeTypeTest extends DrupalWebTestCase { 'foo.file_test_1' => 'application/octet-stream', 'foo.file_test_2' => 'application/octet-stream', 'foo.doc' => 'application/octet-stream', + 'test.ogg' => 'application/octet-stream', ); foreach ($test_case as $input => $expected) { |