diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:29:37 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-07 19:29:37 +0100 |
| commit | 1909b5b1dd5e2d6847cbe4a87a0aadd52b506681 (patch) | |
| tree | 8aaf0c86aa49dc0bacd55daeb2144d40c37ae8e0 /application | |
| parent | a90b1f2f89a41b2fe061f5fdd3f84f08b961a887 (diff) | |
| parent | 1d571971be8be78a92d31aad27dda4009770043f (diff) | |
merged from develop, fixed conflict in user guide.
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', |