diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-10-21 13:37:40 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-10-21 13:37:40 +0200 |
| commit | 7f5f8aaa01764f266b41791568863ec6bfda7e83 (patch) | |
| tree | 8c664f2a4d1c16a565fc442b32e663badac76869 /system | |
| parent | 0850a2857ef24dfa8e5a80da7b4049f70a679d29 (diff) | |
Manually apply PR #2656
Fixes an 'Array to string conversion' notice in form_dropdown()
Diffstat (limited to 'system')
| -rw-r--r-- | system/helpers/form_helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index 85f1f4e01..400a91faa 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -316,7 +316,7 @@ if ( ! function_exists('form_dropdown')) { isset($name['options']) OR $name['options'] = array(); isset($name['selected']) OR $name['selected'] = array(); - isset($name['extra']) OR $name['extra'] = array(); + isset($name['extra']) OR $name['extra'] = ''; return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']); } @@ -328,7 +328,7 @@ if ( ! function_exists('form_dropdown')) { $selected = array($_POST[$name]); } - + $extra = _attributes_to_string($extra); $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; |