From 71f7303914e7ca5f678bd9172fe875af6321504d Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Sun, 7 Aug 2011 13:50:46 -0400 Subject: [PATCH] - Patch #1239376 by Dave Reid: .ogg file extension incorrectly mapped to 'application/ogg' in file_default_mimetype_mapping(). --- includes/file.mimetypes.inc | 2 +- modules/simpletest/tests/file.test | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/file.mimetypes.inc b/includes/file.mimetypes.inc index cda03fb92b37..8509433bee6f 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 db4097c44a0b..3633bae11dd5 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) { -- GitLab