diff options
| author | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
|---|---|---|
| committer | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
| commit | 6949f95f6e21980f36095490bf38fc8a172dbc0f (patch) | |
| tree | b3141f390acd0051396cda6a3da51c1f98384cca /application/config/mimes.php | |
| parent | 68a02a01a086bbb1b8128ea2744439de84873d11 (diff) | |
| parent | 81f036753272391360ba5b64e6dd93c4101a8733 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
system/helpers/form_helper.php
Diffstat (limited to 'application/config/mimes.php')
| -rw-r--r-- | application/config/mimes.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 32d10f6c1..8123557f4 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -18,12 +18,13 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) * @link http://codeigniter.com * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); /* | ------------------------------------------------------------------- @@ -78,6 +79,7 @@ return array( 'sit' => 'application/x-stuffit', 'tar' => 'application/x-tar', 'tgz' => array('application/x-tar', 'application/x-gzip-compressed'), + 'z' => 'application/x-compress', 'xhtml' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml', 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/s-compressed', 'multipart/x-zip'), @@ -96,7 +98,7 @@ return array( 'ra' => 'audio/x-realaudio', 'rv' => 'video/vnd.rn-realvideo', 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), - 'bmp' => array('image/bmp', 'image/x-windows-bmp'), + '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'), |