get MIME type from extension

Closes directus#525
softdzx · Jan 25, 2019 · 7da3ce3 · 7da3ce3
1 parent dc1f588
commit 7da3ce3
Show file tree

Hide file tree

Showing 4 changed files with 3,045 additions and 6 deletions.
diff --git a/src/core/Directus/Application/CoreServicesProvider.php b/src/core/Directus/Application/CoreServicesProvider.php
@@ -303,14 +303,11 @@ protected function getEmitter()
 
                 // NOTE: Use the user input title, tags, description and location when exists.
                 $recordData = ArrayUtils::defaults($recordData, ArrayUtils::pick($data, [
-                    'type',
                     'title',
                     'tags',
                     'description',
                     'location',
-                ]), function ($value) {
-                    return !!$value;
-                });
+                ]));
 
                 $payload->replace($recordData);
                 $payload->remove('data');

diff --git a/src/core/Directus/Filesystem/Files.php b/src/core/Directus/Filesystem/Files.php
@@ -7,6 +7,7 @@
 use function Directus\generate_uuid5;
 use Directus\Util\DateTimeUtils;
 use Directus\Util\Formatting;
+use Directus\Util\MimeTypeUtils;
 
 class Files
 {
@@ -261,7 +262,8 @@ public function saveData($fileData, $fileName, $replace = false)
         $fileData = array_merge($this->defaults, $fileData);
 
         return [
-            'type' => $fileData['type'],
+            // The MIME type will be based on its extension, rather than its content
+            'type' => MimeTypeUtils::getFromFilename($fileData['filename']),
             'filename' => $fileData['filename'],
             'title' => $fileData['title'],
             'tags' => $fileData['tags'],