summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
Diffstat (limited to 'application/config/mimes.php')
-rw-r--r--application/config/mimes.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index dfa9f24e4..0129c3ca1 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -44,13 +44,13 @@ return array(
'lzh' => 'application/octet-stream',
'exe' => array('application/octet-stream', 'application/x-msdownload'),
'class' => 'application/octet-stream',
- 'psd' => 'application/x-photoshop',
+ 'psd' => array('application/x-photoshop', 'image/vnd.adobe.photoshop'),
'so' => 'application/octet-stream',
'sea' => 'application/octet-stream',
'dll' => 'application/octet-stream',
'oda' => 'application/oda',
'pdf' => array('application/pdf', 'application/x-download', 'binary/octet-stream'),
- 'ai' => 'application/postscript',
+ 'ai' => array('application/pdf', 'application/postscript'),
'eps' => 'application/postscript',
'ps' => 'application/postscript',
'smi' => 'application/smil',
@@ -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'),
@@ -160,7 +160,7 @@ return array(
'm3u' => 'text/plain',
'xspf' => 'application/xspf+xml',
'vlc' => 'application/videolan',
- 'wmv' => 'video/x-ms-wmv',
+ 'wmv' => array('video/x-ms-wmv', 'video/x-ms-asf'),
'au' => 'audio/x-au',
'ac3' => 'audio/ac3',
'flac' => 'audio/x-flac',
@@ -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 */