summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2012-08-03 22:39:04 +0200
committerEric Roberts <eric@cryode.com>2012-08-03 22:39:04 +0200
commit17636e8bb20a4d53fec8fd8aaf530f53bd22d612 (patch)
treea844b9aff5ecb42ce2c49ea4e187ef44cc4d39a8 /application/config
parentda038d2ebccb4d45ea6d819c914563b2bc009a86 (diff)
parent6c94c2dcfb6557947c9ac67e419b2856fd80e01d (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php2
-rw-r--r--application/config/user_agents.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 4b1d6a85d..a239bb254 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -37,7 +37,7 @@
return array(
'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'),
'cpt' => 'application/mac-compactpro',
- 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+ 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel', 'text/plain'),
'bin' => array('application/macbinary', 'application/mac-binary', 'application/octet-stream', 'application/x-binary', 'application/x-macbinary'),
'dms' => 'application/octet-stream',
'lha' => 'application/octet-stream',
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 416ef5679..9befddc99 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -36,6 +36,7 @@
*/
$platforms = array(
+ 'windows nt 6.2' => 'Windows 8',
'windows nt 6.1' => 'Windows 7',
'windows nt 6.0' => 'Windows Vista',
'windows nt 5.2' => 'Windows 2003',
@@ -146,6 +147,7 @@ $mobiles = array(
'ipaq' => 'HP iPaq',
'mot-' => 'Motorola',
'playstation portable' => 'PlayStation Portable',
+ 'playstation 3' => 'PlayStation 3',
'hiptop' => 'Danger Hiptop',
'nec-' => 'NEC',
'panasonic' => 'Panasonic',