Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session

1 files changed, 7 insertions, 3 deletions

diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 19b4eec03..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);
 	}
 }
@@ -82,9 +80,15 @@ 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);
 	}
 }