Workaround for some versions/systems where finfo_open() with second

argument doesn't do the same as with no 2nd argument as it should
roundcube · Mar 20, 2013 · 4f693e9 · 4f693e9
1 parent 02c9c93
commit 4f693e9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
@@ -672,7 +672,16 @@ public static function file_content_type($path, $name, $failover = 'application/
 
         // try fileinfo extension if available
         if (!$mime_type && function_exists('finfo_open')) {
-            if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
+            // null as a 2nd argument should be the same as no argument
+            // this however is not true on all systems/versions
+            if ($mime_magic) {
+                $finfo = finfo_open(FILEINFO_MIME, $mime_magic);
+            }
+            else {
+                $finfo = finfo_open(FILEINFO_MIME);
+            }
+
+            if ($finfo) {
                 if ($is_stream)
                     $mime_type = finfo_buffer($finfo, $path);
                 else