diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-10 15:07:17 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-10 15:07:17 +0200 |
| commit | 9f44c21a3c90e984becaea3948ebafe90d89ac56 (patch) | |
| tree | d3fed2b0b455fc1debfa62d05873b5fe108daed7 /system/core/Utf8.php | |
| parent | 6c5f751b5ae66800e7ef3f70306a6bcbcdeeabf1 (diff) | |
Changelog entry for previous commit and change default charset for the Email library to whatever the config array says
Diffstat (limited to 'system/core/Utf8.php')
| -rw-r--r-- | system/core/Utf8.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Utf8.php b/system/core/Utf8.php index 9e6a4eb1b..1ff02981b 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -136,7 +136,7 @@ class CI_Utf8 { { return @iconv($encoding, 'UTF-8', $str); } - elseif (function_exists('mb_convert_encoding')) + elseif (MB_ENABLED === TRUE) { return @mb_convert_encoding($str, 'UTF-8', $encoding); } |