summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-05-25 10:55:11 +0200
committerAndrey Andreev <narf@devilix.net>2017-05-25 10:55:11 +0200
commit26ba694fb2aca751e8fa18e7c73f2c5e0c1c13ab (patch)
treeb008e5ae3bc4431b107d62afcfbd4850f617dce4
parent904a28b41dab825eea4d1a9258aec2ea99b9a9d6 (diff)
[ci skip] Doc changes following PR #5130
-rw-r--r--system/helpers/form_helper.php2
-rw-r--r--user_guide_src/source/changelog.rst4
-rw-r--r--user_guide_src/source/helpers/form_helper.rst2
3 files changed, 6 insertions, 2 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 75c6e5d47..13f196318 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -597,7 +597,7 @@ if ( ! function_exists('form_label'))
*
* @param string The text to appear onscreen
* @param string The id the label applies to
- * @param array Additional attributes
+ * @param mixed Additional attributes
* @return string
*/
function form_label($label_text = '', $id = '', $attributes = array())
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dbba5a687..c8348b0d7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.5
Release Date: Not Released
+- General Changes
+
+ - Updated :doc:`Form Helper <helpers/form_helper>` function :php:func:`form_label()` to accept HTML attributes as a string.
+
Bug fixes for 3.1.5
-------------------
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index bc30a0e98..8da5d22b5 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -486,7 +486,7 @@ The following functions are available:
:param string $label_text: Text to put in the <label> tag
:param string $id: ID of the form element that we're making a label for
- :param string $attributes: HTML attributes
+ :param mixed $attributes: HTML attributes
:returns: An HTML field label tag
:rtype: string