summaryrefslogtreecommitdiffstats
path: root/application/config/mimes.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-10-14 11:19:30 +0200
committerAndrey Andreev <narf@devilix.net>2013-10-14 11:19:30 +0200
commit05ace616adaf9570052ad84d17fbb44b21ba499a (patch)
treeac20630b20e88d250e73b68b255ff2ecc44db13d /application/config/mimes.php
parent4330df2e5870e28d1f2688aa6bd03eab488f340a (diff)
parent3751517a5caf9299072248534577f66f9db9221d (diff)
Merge pull request #2672 from stgeneral/patch-1
Exra bmp mimes
Diffstat (limited to 'application/config/mimes.php')
-rw-r--r--application/config/mimes.php4
1 files changed, 2 insertions, 2 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 */