diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-03 17:36:45 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-03 17:36:45 +0200 |
| commit | 142b618fb7419972288a8f7b58e7e2509b3bf225 (patch) | |
| tree | 53566bfe94a12e7fb2e28ec4122dfa6732f25a64 /system/core/Utf8.php | |
| parent | dda21f6abc76451997b12c07e6066aa49c2d423d (diff) | |
| parent | 0c5180bcfc996f32176f28895e9bd75be582c4fa (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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..2b5a1f5eb 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 + && @ini_get('mbstring.func_overload') !== 1 // Multibyte string function overloading cannot be enabled && $CFG->item('charset') === 'UTF-8' // Application charset must be UTF-8 ) { |