diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 20:39:15 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 20:39:15 +0200 |
| commit | 57ccd441085a4d387a0c7acdd7eec00ff9c1077a (patch) | |
| tree | e0514a8f423613cfb31717e71c04ba186df1b0ae /user_guide_src/source | |
| parent | 8ede1a2ecbb62577afd32996956c5feaf7ddf9b6 (diff) | |
| parent | 5f13efe24a86833cb66d967a791e0eb215c22bfc (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Conflicts:
user_guide/changelog.html
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index e94e87e58..f3e7cbbdd 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -106,6 +106,7 @@ Bug fixes for 2.1.0 - Fixed a bug (#89) - Fix a variable type mismatch in DB <samp>display_error()</samp> where an array is expected, but a string could be set instead. - 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. Version 2.0.3 ============= |