summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-10-06 06:41:29 +0200
committerGreg Aker <greg@gregaker.net>2011-10-06 06:41:29 +0200
commit609077dae021656efc55ff5efce5e09ee892b5d0 (patch)
treed8d03b9a6e751aef9f665612a21b7c9ca1b7757f /system
parent2b6f3578f0826d5ed86ecf640e02c42dde0f38d9 (diff)
parent70037f3fb92937766fcd14ff950f2ce9970722c3 (diff)
Merge pull request #511 from freewil/typography-helper-dry
remove redundant 'if' in typography helper
Diffstat (limited to 'system')
-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);
}
}