diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 18:23:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 18:23:02 +0100 |
| commit | 8e22cfdc2fe626bed2a3e570bc71f25d61d6546c (patch) | |
| tree | 8fac11c939596396b9b3fb4aae83e8cf58e147dd /application | |
| parent | 3793517a9c5c7f2c829d5d56bc5754606fa421de (diff) | |
| parent | ea3eec9f670ea861a65a3e251d8c518ff47e2506 (diff) | |
Merge upstream changes
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', |