Make FileUtil::getMimeType() return application/octet-stream on error
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 5 May 2016 20:15:33 +0000 (22:15 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 6 May 2016 12:02:42 +0000 (14:02 +0200)
wcfsetup/install/files/lib/util/FileUtil.class.php

index 8038116974323a226605055bd3de2f120250cf1a..790f246a5eb48bf2402097e5f9331e64cad4ba58 100644 (file)
@@ -481,11 +481,11 @@ final class FileUtil {
         */
        public static function getMimeType($filename) {
                if (self::$finfo === null) {
-                       if (!class_exists('\finfo', false)) return '';
+                       if (!class_exists('\finfo', false)) return 'application/octet-stream';
                        self::$finfo = new \finfo(FILEINFO_MIME_TYPE);
                }
                
-               return self::$finfo->file($filename);
+               return self::$finfo->file($filename) ?: 'application/octet-stream';
        }
        
        /**