Merge pull request #1482 from kdambekalns/task/update-mediatypes

TASK: Add image/jp2 to known media types
neos · Dec 12, 2018 · 1b879cc · 1b879cc
2 parents eae3125 + 701fde5
commit 1b879cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Neos.Utility.MediaTypes/Classes/MediaTypes.php b/Neos.Utility.MediaTypes/Classes/MediaTypes.php
@@ -386,9 +386,11 @@ abstract class MediaTypes
         'jlt' => 'application/vnd.hp-jlyt',
         'jnlp' => 'application/x-java-jnlp-file',
         'joda' => 'application/vnd.joost.joda-archive',
+        'jp2' => 'image/jp2',
         'jpe' => 'image/jpeg',
         'jpeg' => 'image/jpeg',
         'jpg' => 'image/jpeg',
+        'jpg2' => 'image/jp2',
         'jpgm' => 'video/jpm',
         'jpgv' => 'video/jpeg',
         'jpm' => 'video/jpm',
@@ -1662,6 +1664,7 @@ abstract class MediaTypes
         'image/g3fax' => ['g3'],
         'image/gif' => ['gif'],
         'image/ief' => ['ief'],
+        'image/jp2' => ['jp2', 'jpg2'],
         'image/jpeg' => ['jpeg', 'jpg', 'jpe'],
         'image/ktx' => ['ktx'],
         'image/png' => ['png'],

diff --git a/Neos.Utility.MediaTypes/Scripts/updatemediatypes.php b/Neos.Utility.MediaTypes/Scripts/updatemediatypes.php
@@ -33,6 +33,7 @@
 
 // Add non-registered mime types that we still want to support:
 $mediaTypesAndFileExtensions['application/vnd.apple.pkpass'] = ['pkpass'];
+$mediaTypesAndFileExtensions['image/jp2'] = ['jp2', 'jpg2'];
 
 ksort($mediaTypesAndFileExtensions);