diff options
| author | freewil <sean@eternalrise.com> | 2011-08-28 03:53:00 +0200 |
|---|---|---|
| committer | freewil <sean@eternalrise.com> | 2011-08-28 03:53:00 +0200 |
| commit | 8cc0cfe1ab1e10aad71d14e0b43e05444c00693d (patch) | |
| tree | 85c2916096b74432ea78076e6c65a01790c1ba7b /system/core/Security.php | |
| parent | c3757b80ebe76ab3807933901cda0e9b7a405690 (diff) | |
always use charset config item
Diffstat (limited to 'system/core/Security.php')
| -rwxr-xr-x | system/core/Security.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Security.php b/system/core/Security.php index 342455f27..cc21ddc91 100755 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -525,9 +525,10 @@ class CI_Security { * @param string * @return string */ - public function entity_decode($str, $charset='UTF-8') + public function entity_decode($str, $charset = NULL) { if (stristr($str, '&') === FALSE) return $str; + if (empty($charset)) $charset = config_item('charset'); // The reason we are not using html_entity_decode() by itself is because // while it is not technically correct to leave out the semicolon |