From 11bf768f557e7c63f8702648705536773b37c9b8 Mon Sep 17 00:00:00 2001 From: Adrian Voicu Date: Thu, 5 Feb 2015 12:14:55 +0200 Subject: Allow not-escaping the value in set_value() Wouldn't it be a good idea to allow for not escaped html in set_value()? --- system/helpers/form_helper.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index fb235291e..f6d6b433e 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -676,17 +676,18 @@ if ( ! function_exists('set_value')) * * @param string $field Field name * @param string $default Default value + * @param bool $escaped Escaped value * @return string */ - function set_value($field, $default = '') + function set_value($field, $default = '',$escaped = TRUE) { $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 html_escape($value === NULL ? $default : $value); + $value = ($value === NULL) ? $default : $value; + return $escaped ? html_escape($value) : $value; } } -- cgit v1.2.3-24-g4f1b From 86e6a19eaa1f994588beee2c47143c19c800c8ec Mon Sep 17 00:00:00 2001 From: Adrian Voicu Date: Thu, 5 Feb 2015 13:51:26 +0200 Subject: Update form_helper.php --- system/helpers/form_helper.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index f6d6b433e..dca4270f6 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -676,18 +676,19 @@ if ( ! function_exists('set_value')) * * @param string $field Field name * @param string $default Default value - * @param bool $escaped Escaped value + * @param bool $html_escape HTML escaped value * @return string */ - function set_value($field, $default = '',$escaped = TRUE) + function set_value($field, $default = '', $html_escape = TRUE) { $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); - $value = ($value === NULL) ? $default : $value; - return $escaped ? html_escape($value) : $value; + + isset($value) OR $value = $default; + return ($html_escape) ? html_escape($value) : $value; } } -- cgit v1.2.3-24-g4f1b From fa61fb236654fbd3eea82d437da28c9aab33e559 Mon Sep 17 00:00:00 2001 From: Adrian Voicu Date: Thu, 5 Feb 2015 15:46:12 +0200 Subject: Update form_helper.php --- system/helpers/form_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/helpers/form_helper.php') diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php index dca4270f6..70c40a9c3 100644 --- a/system/helpers/form_helper.php +++ b/system/helpers/form_helper.php @@ -676,7 +676,7 @@ if ( ! function_exists('set_value')) * * @param string $field Field name * @param string $default Default value - * @param bool $html_escape HTML escaped value + * @param bool $html_escape Whether to escape HTML special characters or not * @return string */ function set_value($field, $default = '', $html_escape = TRUE) -- cgit v1.2.3-24-g4f1b