always use charset config item
diff --git a/system/core/Security.php b/system/core/Security.php
index cc21ddc..e99418b 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -527,8 +527,15 @@
*/
public function entity_decode($str, $charset = NULL)
{
- if (stristr($str, '&') === FALSE) return $str;
- if (empty($charset)) $charset = config_item('charset');
+ 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
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 0bb0938..82e686e 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -39,9 +39,7 @@
function nl2br_except_pre($str)
{
$CI =& get_instance();
-
$CI->load->library('typography');
-
return $CI->typography->nl2br_except_pre($str);
}
}
@@ -86,7 +84,10 @@
{
global $SEC;
- if (empty($charset)) $charset = config_item('charset');
+ if (empty($charset))
+ {
+ $charset = config_item('charset');
+ }
return $SEC->entity_decode($str, $charset);
}