Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

This commit is contained in:
Shish 2017-09-21 15:35:22 +01:00
commit 4dead6837f

View File

@ -715,7 +715,7 @@ function getMimeType(string $file, string $ext=""): string {
// Static extension lookup
$ext = strtolower($ext);
if (isset($exts[$ext])) { return MIME_TYPE_MAP[$ext]; }
if (isset(MIME_TYPE_MAP[$ext])) { return MIME_TYPE_MAP[$ext]; }
$type = false;
// Fileinfo documentation says fileinfo_open() will use the