diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-06-19 11:02:53 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-06-19 11:02:53 +0200 |
| commit | 8186b6b398c26c0c1e0052eaddf4fc122e4929a5 (patch) | |
| tree | 0290ebd53dd9b5167680e80e22342d751001fe56 /system/helpers | |
| parent | af5c8960d80a9db362722ca675ffddb2079bbce9 (diff) | |
| parent | 47f540e82cbc1591cc7f1aa92d47a8c8c4028c63 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
tests/codeigniter/libraries/Form_validation_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/form_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 6f7e63b32..0c7ee4a40 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -596,7 +596,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()) |