diff options
| author | Joël Cox <joel@joelcox.nl> | 2011-10-09 18:45:09 +0200 |
|---|---|---|
| committer | Joël Cox <joel@joelcox.nl> | 2011-10-09 18:45:09 +0200 |
| commit | 8ffcb2c8c7ef3da54d7e46c29d502533e413c820 (patch) | |
| tree | 1f94e2e81b4d20f2df827b8a84eeda27032161a1 /system/helpers/typography_helper.php | |
| parent | f4fb1db458fab52d0493ead52c9ea7e01206eaa7 (diff) | |
| parent | 6858c0753a7221796d6a5a1d7fea93cc2f9feb2e (diff) | |
Merged develop branch in tutorial.
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); |