summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 14:33:28 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 14:33:28 +0100
commita5a2cfef881f4cb70729b854e2e86932f28c43f6 (patch)
treede099e40accdba7d9917a2215d2b4b89425d7135 /application
parentb692ccb2414928913ebd713a094fc3150db07495 (diff)
parentadcb8fdc38078f1868f408de21d1a08b59a7781b (diff)
Merge pull request #1088 from IT-Can/word-mime-fix
mime types doc fixes
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 2a68ce9e1..d69497a30 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -120,7 +120,7 @@ $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',
+ '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'),