summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-06 21:19:07 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-06 21:19:07 +0100
commit8f7db7bf06ab3014f80fdb730df13b57d87c2196 (patch)
treea61142583e19002db610e3ef74f3a9f0eedbd8e0 /application/config/mimes.php
parentc91a66cd7c770f8060cbe366491c1f4de9147da4 (diff)
parent738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff)
updated and merged user guide with develop branch.
Diffstat (limited to 'application/config/mimes.php')
-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',