diff options
| author | purwandi <free6300@gmail.com> | 2011-10-07 15:00:17 +0200 |
|---|---|---|
| committer | purwandi <free6300@gmail.com> | 2011-10-07 15:00:17 +0200 |
| commit | 526433e86e0c3d838452d61e0d1a97b6b5a3c323 (patch) | |
| tree | 22c08e8d31b4f5c0ab37cd5aec9b1dd5d18aa2ee | |
| parent | 89f6f1a750daa78ef88a7d1c2276cdc8591aff5d (diff) | |
| parent | 0252fc7ddf80262f915b20100107ec79ba3ccf01 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
| -rw-r--r-- | application/config/mimes.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 206329fde..6f73ae038 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -66,7 +66,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'rpm' => 'audio/x-pn-realaudio-plugin', 'ra' => 'audio/x-realaudio', 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', + 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), 'bmp' => array('image/bmp', 'image/x-windows-bmp'), 'gif' => 'image/gif', 'jpeg' => array('image/jpeg', 'image/pjpeg'), @@ -137,4 +137,4 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */
\ No newline at end of file +/* Location: ./application/config/mimes.php */ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f3e7cbbdd..925785d13 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -107,6 +107,7 @@ Bug fixes for 2.1.0 - Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4) - Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php). - Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library <libraries/file_uploading>` in order to fix a possible MIME-type injection. +- Fixed a bug (#537) - Support for all wav type in browser. Version 2.0.3 ============= |