summaryrefslogtreecommitdiffstats
path: root/system/helpers/typography_helper.php
diff options
context:
space:
mode:
authorfreewil <sean@eternalrise.com>2011-08-28 18:15:23 +0200
committerfreewil <sean@eternalrise.com>2011-08-28 18:15:23 +0200
commit5c9b0d1b5618ade5c6aa70475b08b3066f14ff3e (patch)
treea5df2e6f1a2a9c0e55d48c102c91ede73ac3c318 /system/helpers/typography_helper.php
parent8cc0cfe1ab1e10aad71d14e0b43e05444c00693d (diff)
always use charset config item
Diffstat (limited to 'system/helpers/typography_helper.php')
-rw-r--r--system/helpers/typography_helper.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 0bb0938a4..82e686e53 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);
}
}
@@ -86,7 +84,10 @@ if ( ! function_exists('entity_decode'))
{
global $SEC;
- if (empty($charset)) $charset = config_item('charset');
+ if (empty($charset))
+ {
+ $charset = config_item('charset');
+ }
return $SEC->entity_decode($str, $charset);
}