diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-02-29 14:58:55 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-02-29 14:58:55 +0100 |
| commit | 7980923d0c7e62fb545e3b750dfe5cec4a057b48 (patch) | |
| tree | f8d4a382b897ccb34497a76798daac930fb338a3 /application | |
| parent | 249842f2f79aaee7cdb02696f1b55e71e0623a08 (diff) | |
| parent | a5a2cfef881f4cb70729b854e2e86932f28c43f6 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 8c34fd298..d69497a30 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -120,9 +120,9 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'mov' => 'video/quicktime', 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', - 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'doc' => array('application/msword', 'application/vnd.ms-office'), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'), + 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'), 'word' => array('application/msword', 'application/octet-stream'), 'xl' => 'application/excel', 'eml' => 'message/rfc822', |