summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-06-04 16:01:29 +0200
committerGitHub <noreply@github.com>2018-06-04 16:01:29 +0200
commitdc4a791ab07eeadb6f67eb26311c07199855390f (patch)
tree310d0b0c590ffa24464defadabd36360561483eb
parent721e34619f79585cdad92174373edcf2b049931f (diff)
parent8eeb1a88eba76e6d4ed87a7a72a2272c27a1eeb4 (diff)
[ci skip] Merge pull request #5512 from gxgpet/develop
mimes.php: 7z file types changes
-rw-r--r--application/config/mimes.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 017653335..0ec9db0a0 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -155,7 +155,8 @@ return array(
'ics' => 'text/calendar',
'ical' => 'text/calendar',
'zsh' => 'text/x-scriptzsh',
- '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
+ '7z' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
+ '7zip' => array('application/x-7z-compressed', 'application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'),
'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed'),