From f4e223019174d66c593269d918cc740836340033 Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 30 Jan 2018 09:14:37 -0700 Subject: [PATCH] * Etemplate - Don't trust browsers mime if we don't have to - fixes incorrect mime types and Resources rejecting pictures --- api/src/Etemplate/Widget/File.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/Etemplate/Widget/File.php b/api/src/Etemplate/Widget/File.php index 7930e0b03c..9ec6cd7529 100644 --- a/api/src/Etemplate/Widget/File.php +++ b/api/src/Etemplate/Widget/File.php @@ -147,10 +147,15 @@ class File extends Etemplate\Widget } if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) { + // Don't trust what the browser tells us for mime + if(function_exists('mime_content_type')) + { + $file['type'] = $type = mime_content_type($file['tmp_name']); + } + // Mime check if($mime) { - $type = $file['type']; $is_preg = $mime[0] == '/'; if (!$is_preg && strcasecmp($mime,$type) || $is_preg && !preg_match($mime,$type))