diff options
| author | Devesa AgustÃn <devesagustserwi@est.frba.utn.edu.ar> | 2020-01-08 16:29:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:29:56 +0100 |
| commit | 8cc1f662de7b536e8e16ef6b7384f03892f5e79e (patch) | |
| tree | 33de9ceee4968ceed4fb9d95de990f8685d0222d /application | |
| parent | f0a6de54ae1f5ffb9ae7d2c20e92749e396e2b17 (diff) | |
| parent | ce5815d9b3e99c99b75eace703e52d2b236b6392 (diff) | |
Merge pull request #1 from adevesa/develop
change appliation/config.php for webp mime
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 7aa5c9e4e..9c76b87f1 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -74,9 +74,9 @@ return array( 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), 'bmp' => array('image/bmp', 'image/x-bmp', 'image/x-bitmap', 'image/x-xbitmap', 'image/x-win-bitmap', 'image/x-windows-bmp', 'image/ms-bmp', 'image/x-ms-bmp', 'application/bmp', 'application/x-bmp', 'application/x-win-bitmap'), 'gif' => 'image/gif', - 'jpeg' => array('image/jpeg', 'image/pjpeg'), - 'jpg' => array('image/jpeg', 'image/pjpeg'), - 'jpe' => array('image/jpeg', 'image/pjpeg'), + 'jpeg' => array('image/jpeg', 'image/pjpeg','image/webp'), + 'jpg' => array('image/jpeg', 'image/pjpeg','image/webp'), + 'jpe' => array('image/jpeg', 'image/pjpeg','image/webp'), 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), @@ -140,6 +140,7 @@ return array( 'f4v' => array('video/mp4', 'video/x-f4v'), 'flv' => 'video/x-flv', 'webm' => 'video/webm', + 'webp' => 'image/webp', 'aac' => array('audio/x-aac', 'audio/aac'), 'm4u' => 'application/vnd.mpegurl', 'm3u' => 'text/plain', |