summaryrefslogtreecommitdiffstats
path: root/system/helpers/typography_helper.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-06 18:21:59 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-06 18:21:59 +0200
commit2be33e8762df028af678e775f07ebfefb9b8b334 (patch)
tree5e2bf3279773af7814963cd00063ad28f6b4f903 /system/helpers/typography_helper.php
parentfb7ff742949e0474dfba30be45be513b3b4f63cc (diff)
parentf003804d105aa6d60ee4c26b1e8a77423d99274b (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/helpers/typography_helper.php')
-rw-r--r--system/helpers/typography_helper.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 82e686e53..e8cb037a8 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -76,6 +76,7 @@ if ( ! function_exists('auto_typography'))
*
* @access public
* @param string
+ * @param string
* @return string
*/
if ( ! function_exists('entity_decode'))
@@ -83,12 +84,6 @@ if ( ! function_exists('entity_decode'))
function entity_decode($str, $charset = NULL)
{
global $SEC;
-
- if (empty($charset))
- {
- $charset = config_item('charset');
- }
-
return $SEC->entity_decode($str, $charset);
}
}