diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2011-10-10 16:31:56 +0200 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2011-10-10 16:31:56 +0200 |
| commit | 8afb848fded8fbdfa24b72df7f067e960c83c0e8 (patch) | |
| tree | bf3d8fa70610253cb13a87c1aa9d634dcee9f413 /system/helpers/typography_helper.php | |
| parent | 25246b6b29d87ad7a4f304a7b5623c9f57953356 (diff) | |
| parent | bdbe6d222c15e9d1b42a8ee3a3e7fe04b753c1ba (diff) | |
Codeigniter develop latest.
Diffstat (limited to 'system/helpers/typography_helper.php')
| -rw-r--r-- | system/helpers/typography_helper.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php index 19b4eec03..e8cb037a8 100644 --- a/system/helpers/typography_helper.php +++ b/system/helpers/typography_helper.php @@ -39,9 +39,7 @@ if ( ! function_exists('nl2br_except_pre')) function nl2br_except_pre($str) { $CI =& get_instance(); - $CI->load->library('typography'); - return $CI->typography->nl2br_except_pre($str); } } @@ -78,11 +76,12 @@ if ( ! function_exists('auto_typography')) * * @access public * @param string + * @param string * @return string */ if ( ! function_exists('entity_decode')) { - function entity_decode($str, $charset='UTF-8') + function entity_decode($str, $charset = NULL) { global $SEC; return $SEC->entity_decode($str, $charset); |