summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-05 08:50:58 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-05 08:50:58 +0100
commit46d31b748e20ec1798987b1d3b4e27765ff93fbb (patch)
tree2e73a55489e256e62f9fc607beee8ee9c6dc43a7 /application
parent1d6d278607f021e5c430192e14de641904575d5d (diff)
parentbaad7617b432708ef438a3b421e8b61b0d509b9d (diff)
Merge pull request #2227 from Lasha/patch-1
Added 'application/x-zip' mimetype for docx
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index ac1479c0a..0129c3ca1 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', 'application/msword'),
+ 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword', 'application/x-zip'),
'dot' => array('application/msword', 'application/vnd.ms-office'),
'dotx' => 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'),
@@ -176,4 +176,4 @@ return array(
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */ \ No newline at end of file
+/* Location: ./application/config/mimes.php */