diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/file.inc | 8 | ||||
| -rw-r--r-- | includes/file.mimetypes.inc | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/includes/file.inc b/includes/file.inc index ead32264c..5478e8748 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -1544,10 +1544,14 @@ function file_upload_max_size() { * An optional map of extensions to their mimetypes, in the form: * - 'mimetypes': a list of mimetypes, keyed by an identifier, * - 'extensions': the mapping itself, an associative array in which - * the key is the extension and the value is the mimetype identifier. + * the key is the extension (lowercase) and the value is the mimetype identifier. + * If $mapping is omitted, the drupal variable mime_extension_mapping is checked + * for a value and if that fails then file_default_mimetype_mapping() is called * * @return * The internet media type registered for the extension or application/octet-stream for unknown extensions. + * @see + * file_default_mimetype_mapping() */ function file_get_mimetype($filename, $mapping = NULL) { if (!isset($mapping)) { @@ -1571,7 +1575,7 @@ function file_get_mimetype($filename, $mapping = NULL) { // - image.jpeg, and // - awesome.image.jpeg while ($additional_part = array_pop($file_parts)) { - $extension = $additional_part . ($extension ? '.' . $extension : ''); + $extension = strtolower($additional_part . ($extension ? '.' . $extension : '')); if (isset($mapping['extensions'][$extension])) { return $mapping['mimetypes'][$mapping['extensions'][$extension]]; } diff --git a/includes/file.mimetypes.inc b/includes/file.mimetypes.inc index 501e1a4cf..f0586f2fb 100644 --- a/includes/file.mimetypes.inc +++ b/includes/file.mimetypes.inc @@ -1,7 +1,18 @@ <?php +// $Id$ + +/** + * @file + * Provides mimetype mappings. + */ + /** * Default MIME extension mapping. + * + * @return + * Array of mimetypes correlated to the extensions that relate to them. + * @see file_get_mimetype() */ function file_default_mimetype_mapping() { return array( @@ -355,6 +366,8 @@ function file_default_mimetype_mapping() { 344 => 'x-epoc/x-sisx-app', 345 => 'x-world/x-vrml', ), + + // Extensions added to this list MUST be lower-case. 'extensions' => array( 'ez' => 0, 'atom' => 1, @@ -484,7 +497,7 @@ function file_default_mimetype_mapping() { 'pfb' => 113, 'pcf' => 113, 'gsf' => 113, - 'pcf.Z' => 113, + 'pcf.z' => 113, 'mm' => 114, 'spl' => 115, 'gnumeric' => 116, |