summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php4
-rw-r--r--application/config/user_agents.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index ad3602126..99b1c4b7d 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -97,7 +97,7 @@ return array(
'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo',
'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'),
- 'bmp' => array('image/bmp', 'image/x-windows-bmp'),
+ 'bmp' => array('image/bmp', 'image/x-bmp', 'image/x-bitmap', 'image/x-xbitmap', 'image/x-win-bitmap', 'image/x-windows-bmp', 'image/ms-bmp', 'image/x-ms-bmp', 'application/bmp', 'application/x-bmp', 'application/x-win-bitmap'),
'gif' => 'image/gif',
'jpeg' => array('image/jpeg', 'image/pjpeg'),
'jpg' => array('image/jpeg', 'image/pjpeg'),
@@ -177,4 +177,4 @@ return array(
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */ \ No newline at end of file
+/* Location: ./application/config/mimes.php */
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 5887a15be..9177f3e61 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -81,6 +81,7 @@ $platforms = array(
// The order of this array should NOT be changed. Many browsers return
// multiple browser types so we want to identify the sub-type first.
$browsers = array(
+ 'OPR' => 'Opera',
'Flock' => 'Flock',
'Chrome' => 'Chrome',
'Opera' => 'Opera',
@@ -222,4 +223,4 @@ $robots = array(
);
/* End of file user_agents.php */
-/* Location: ./application/config/user_agents.php */ \ No newline at end of file
+/* Location: ./application/config/user_agents.php */