Merge branch 'feature/form_helper' of github.com:darkhouse/CodeIgniter into feature/form_helpers_extra_array
Manually fixed conflicts in:
user_guide_src/source/changelog.rst
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b7888ca..4fe3b94 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,7 @@
Release Date: Not Released
- Core
-
+
- Added DoS mitigation to :php:func:`hash_pbkdf2()` :doc:`compatibility function <general/compatibility_functions>`.
- Database
@@ -28,6 +28,7 @@
- Helpers
- Added Unicode support to :doc:`URL Helper <helpers/url_helper>` function :php:func:`url_title()`.
+ - Added support for passing the "extra" parameter as an array to all :doc:`Form Helper <helpers/form_helper>` functions that use it.
Bug fixes for 3.0.1
-------------------