summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authordchill42 <dchill42@gmail.com>2012-08-27 17:57:31 +0200
committerdchill42 <dchill42@gmail.com>2012-08-27 17:57:31 +0200
commit62ece3359211482dc5671b9521454608ad226840 (patch)
treed80aac29baaad6e9b51e865dc3ab7367c40077d4 /application
parentaee9265602c3bb30a1f7f3dfd562b9b36cc612a4 (diff)
parent2d5c209943ef1e2644504e8d5cb32d3d66b45632 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into session
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php6
-rw-r--r--application/config/user_agents.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index a239bb254..48771dc15 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -56,7 +56,7 @@ return array(
'smi' => 'application/smil',
'smil' => 'application/smil',
'mif' => 'application/vnd.mif',
- 'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
+ 'xls' => array('application/vnd.ms-excel', 'application/msexcel', 'application/x-msexcel', 'application/x-ms-excel', 'application/x-excel', 'application/x-dos_ms_excel', 'application/xls', 'application/x-xls', 'application/excel', 'application/download', 'application/vnd.ms-office', 'application/msword'),
'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'wbxml' => 'application/wbxml',
@@ -123,8 +123,8 @@ 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'),
- 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
+ 'docx' => 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'),
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
'eml' => 'message/rfc822',
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 9befddc99..78e4c8c7d 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -157,10 +157,10 @@ $mobiles = array(
'spv' => 'SPV',
'zte' => 'ZTE',
'sendo' => 'Sendo',
- 'dsi' => 'Nintendo DSi',
- 'ds' => 'Nintendo DS',
+ 'nintendo dsi' => 'Nintendo DSi',
+ 'nintendo ds' => 'Nintendo DS',
+ 'nintendo 3ds' => 'Nintendo 3DS',
'wii' => 'Nintendo Wii',
- '3ds' => 'Nintendo 3DS',
'open web' => 'Open Web',
'openweb' => 'OpenWeb',