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/helpers/typography_helper.php | |
| parent | c3757b80ebe76ab3807933901cda0e9b7a405690 (diff) | |
always use charset config item
Diffstat (limited to 'system/helpers/typography_helper.php')
| -rw-r--r-- | system/helpers/typography_helper.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 19b4eec03..0bb0938a4 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -82,9 +82,12 @@ if ( ! function_exists('auto_typography')) */ if ( ! function_exists('entity_decode')) { - function entity_decode($str, $charset='UTF-8') + function entity_decode($str, $charset = NULL) { global $SEC; + + if (empty($charset)) $charset = config_item('charset'); + return $SEC->entity_decode($str, $charset); } } |