summaryrefslogtreecommitdiffstats
path: root/system/helpers/form_helper.php
diff options
context:
space:
mode:
authorDarren Hill <dchill42@gmail.com>2011-08-31 20:13:02 +0200
committerDarren Hill <dchill42@gmail.com>2011-08-31 20:13:02 +0200
commit054be5beba0b80b861ac170513bd94d73a478663 (patch)
treed4f55e5133f6cb787b0f7f2bab68d16e513eee1c /system/helpers/form_helper.php
parent4d1cd4c56697bc53b5a9899089ab4c978c66e1da (diff)
parentd369077ac6cae25fa51c9840a466e54333300d0a (diff)
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
Diffstat (limited to 'system/helpers/form_helper.php')
-rw-r--r--system/helpers/form_helper.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index d9305c00b..130daee6a 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -642,11 +642,8 @@ if ( ! function_exists('form_prep'))
{
return $str;
}
-
- $str = htmlspecialchars($str);
-
- // In case htmlspecialchars misses these.
- $str = str_replace(array("'", '"'), array("&#39;", "&quot;"), $str);
+
+ $str = html_escape($str);
if ($field_name != '')
{