diff options
| author | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
|---|---|---|
| committer | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-03-06 22:27:46 +0100 |
| commit | 3b1355c595127280d6d84d8b617a91fbeda319f5 (patch) | |
| tree | 61e9d7c334e350846ffc3b528fbcbe85b036e1e9 /application | |
| parent | 576b47e9947d4f5bc25a3f72e3978a3d7f9ca1de (diff) | |
| parent | 738f53448fecd1a27c7f89965fbfc47b3bafdb9b (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/database/DB_driver.php
system/database/DB_query_builder.php
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', |