diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
| commit | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (patch) | |
| tree | eb2adb1cf4f1dea1e4d14c69a3f1a275b14cff08 /system/core/Utf8.php | |
| parent | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (diff) | |
| parent | fc11dcc82cefa7299e6f8c74d0e005ebb6fa568c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
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 a6faa84ec..0a7ec501c 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -54,7 +54,7 @@ class CI_Utf8 { if ( @preg_match('/./u', 'é') === 1 // PCRE must support UTF-8 && function_exists('iconv') // iconv must be installed - && @ini_get('mbstring.func_overload') != 1 // Multibyte string function overloading cannot be enabled + && (bool) @ini_get('mbstring.func_overload') !== TRUE // Multibyte string function overloading cannot be enabled && $CFG->item('charset') === 'UTF-8' // Application charset must be UTF-8 ) { |