diff options
| author | Alex Bilbie <alex@alexbilbie.com> | 2012-08-23 17:59:54 +0200 |
|---|---|---|
| committer | Alex Bilbie <alex@alexbilbie.com> | 2012-08-23 17:59:54 +0200 |
| commit | 6a9b85e1512399745d17b5eafb236d2541a16228 (patch) | |
| tree | 19022dd5526e67b546a5b6d1b563956ba79ab64d /application | |
| parent | 87687e10c582b085afdc649ec810a2d2cf34e98b (diff) | |
| parent | a819580fd7d921bb1687d5690712cd61eed82dd2 (diff) | |
Merge pull request #1733 from IT-Can/word-mime-fix
.docx mimetype updated
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 1917b11de..48771dc15 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -123,7 +123,7 @@ return array( 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', 'doc' => array('application/msword', 'application/vnd.ms-office'), - 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword'), 'word' => array('application/msword', 'application/octet-stream'), 'xl' => 'application/excel', |