summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-01 11:36:47 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-01 11:36:47 +0100
commit2ccb60ed153a7c86c31a230c08bd42f22111398a (patch)
treedb0ae5bd51fd6b91512602e1cbffaf1c77e9ca95
parentdcad9970e9725847e8176d95b8b47755736869be (diff)
parentd5c711cce17bbe2b24785e91a5ecc829e1ad5bf6 (diff)
Merge pull request #2216 from kaoz70/develop
Added some mime types, for newer or older files.
-rw-r--r--application/config/mimes.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index dfa9f24e4..ac1479c0a 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',
@@ -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',