summaryrefslogtreecommitdiffstats
path: root/system/helpers/form_helper.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-08-30 02:31:48 +0200
committerGreg Aker <greg@gregaker.net>2011-08-30 02:31:48 +0200
commitb50df5f018176c0cd0ad498e9c710a2b0b016a80 (patch)
tree95733dbbcc348a92aad5d979db2e5da471859c25 /system/helpers/form_helper.php
parentc964e72aabc3a646dbb82f6bf609e9532e75d011 (diff)
parentd7a28663344fbb760134b5623b8cb441f4875f80 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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 != '')
{