- use fallback if mime_content_type() returns false (#1485222)

git-svn-id: https://svn.roundcube.net/trunk@1594 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 801dac7fe..4cab27096 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -561,13 +561,17 @@ function rc_mime_content_type($path, $failover = 'unknown/unknown')
     $mime_magic = $CONFIG['mime_magic'];
 
     if (function_exists('mime_content_type')) {
-        return mime_content_type($path);
+	$finfo = mime_content_type($path); 
+	if ($finfo)
+	    return $finfo;
     }
+    
     if (!extension_loaded('fileinfo')) { 
         if (!dl('fileinfo.' . PHP_SHLIB_SUFFIX)) {
             return $failover;
         }
     }
+    
     $finfo = finfo_open(FILEINFO_MIME, $mime_magic);
     if (!$finfo) {
         return $failover;