diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-03-26 14:44:12 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-03-26 14:44:12 +0100 |
| commit | 5269c1cf2d5ae749309b06194f0a2a737a9ff114 (patch) | |
| tree | f4155535f7293524b4cdc2c03e4f10369b9263e7 /system/helpers | |
| parent | ee34b84be6697bd4da411edaf625ed97a9480def (diff) | |
| parent | 408cbb4f3582ac64bb534a6539370992071d5950 (diff) | |
Merge pull request #2348 from nisheeth-barthwal/feature/nested_keys
Added Parsing Capabilities to Input class for nested array keys
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/form_helper.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index fd9e7be7c..2002d4269 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -641,14 +641,13 @@ if ( ! function_exists('set_value')) */ function set_value($field = '', $default = '', $is_textarea = FALSE) { - if (FALSE === ($OBJ =& _get_validation_object())) - { - return isset($_POST[$field]) - ? form_prep($_POST[$field], $is_textarea) - : form_prep($default, $is_textarea); - } + $CI =& get_instance(); + + $value = (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field)) + ? $CI->form_validation->set_value($field, $default) + : $CI->input->post($field, FALSE); - return form_prep($OBJ->set_value($field, $default), $is_textarea); + return form_prep($value === NULL ? $default : $value, $is_textarea); } } |