summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichiel Vugteveen <info@it-can.nl>2012-02-28 11:40:37 +0100
committerMichiel Vugteveen <info@it-can.nl>2012-02-28 11:40:37 +0100
commite700bbaea19d0eba24b51a8de92d28827fb7e89b (patch)
treecd02cf8b850f9948bd95c45b93f2fb4cf1e659bb
parentd8a0aed00b2174af5cac96ecada10ea392e19120 (diff)
mime types doc, docx, xlsx fixes
-rw-r--r--application/config/mimes.php6
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',