diff options
| author | Florian Pritz <bluewind@xinu.at> | 2021-02-21 11:18:58 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2021-02-21 11:18:58 +0100 |
| commit | 08510ba2faa4785339ca7093ba0fa7052ff5d0c8 (patch) | |
| tree | 108365fe3624295d70a677642b300fd458e7c569 /application/config/mimes.php | |
| parent | 29e6c8ad462a426f4bc6d380646e434e3361a21d (diff) | |
| parent | 0925b5099919300a239909588351a6482c5e792d (diff) | |
PHP8: Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 7aa5c9e4e..f5407ff89 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -5,7 +5,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------- | MIME TYPES | ------------------------------------------------------------------- -| This file contains an array of mime types. It is used by the +| This file contains an array of mime types. It is used by the | Upload class to help identify allowed file types. | */ @@ -85,9 +85,11 @@ return array( 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), - 'png' => array('image/png', 'image/x-png'), + 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', + 'heic' => 'image/heic', + 'heif' => 'image/heif', 'css' => array('text/css', 'text/plain'), 'html' => array('text/html', 'text/plain'), 'htm' => array('text/html', 'text/plain'), |