diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-06-14 20:56:36 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-06-14 20:56:36 +0200 |
| commit | fb56cdb3efd11f4ec6cf053b8f04cc51a7d3bd4e (patch) | |
| tree | fd81b4a7064f3dba7bdfadbd7a29424539cef324 /application | |
| parent | f34668f94b6a69fa777c6025ccc798b5e3c1110f (diff) | |
| parent | 30e2eafa86c4c7b6b39cea3e7089a90df9f603fb (diff) | |
Merge tag '3.1.9' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/mimes.php | 3 | ||||
| -rw-r--r-- | application/config/user_agents.php | 2 |
2 files changed, 3 insertions, 2 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'), diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 798086b65..b6c85631e 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -61,7 +61,7 @@ $platforms = array( $browsers = array( 'OPR' => 'Opera', 'Flock' => 'Flock', - 'Edge' => 'Spartan', + 'Edge' => 'Edge', 'Chrome' => 'Chrome', // Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string 'Opera.*?Version' => 'Opera', |