Changeset 5770 in subversion for branches/release-0.7/program/include/rcube_shared.inc

Timestamp:

Jan 13, 2012 6:23:17 AM (16 months ago)

Author:

alec

Message:

• Backported r5769 from trunk

File:

• branches/release-0.7/program/include/rcube_shared.inc (modified) (2 diffs)

branches/release-0.7/program/include/rcube_shared.inc

@@ -363 +363 @@
     $mime_magic = rcmail::get_instance()->config->get('mime_magic');
     $mime_ext = @include(RCMAIL_CONFIG_DIR . '/mimetypes.php');
-    $suffix = $name ? substr($name, strrpos($name, '.')+1) : '*';
 
     // use file name suffix with hard-coded mime-type map
-    if (is_array($mime_ext)) {
-        $mime_type = $mime_ext[$suffix];
-    }
+    if (is_array($mime_ext) && $name) {
+        if ($suffix = substr($name, strrpos($name, '.')+1)) {
+            $mime_type = $mime_ext[strtolower($suffix)];
+        }
+    }
+
     // try fileinfo extension if available
     if (!$mime_type && function_exists('finfo_open')) {
@@ -379 +381 @@
         }
     }
+
     // try PHP's mime_content_type
     if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
       $mime_type = @mime_content_type($path);
     }
+
     // fall back to user-submitted string
     if (!$mime_type) {