diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-18 16:36:07 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-18 16:36:07 +0100 |
| commit | ecaef964232f7889eb3eab35b69cebbf3221ad66 (patch) | |
| tree | 56759ff61e0512db9debfceb6f119ea3ea4dc911 /system/core/Utf8.php | |
| parent | 60f71be48a6b91cc314908c3c0007f13e9cb2f0a (diff) | |
| parent | b2a0e70585367e59bf2d106629c0e9c3ab1370c2 (diff) | |
Merge branch 'develop' into feature/output_compressed_cache
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 a78616d40..828a8aeba 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -66,7 +66,7 @@ class CI_Utf8 { } if ( - @preg_match('/./u', 'é') === 1 // PCRE must support UTF-8 + defined('PREG_BAD_UTF8_ERROR') // PCRE must support UTF-8 && function_exists('iconv') // iconv must be installed && MB_ENABLED === TRUE // mbstring must be enabled && $charset === 'UTF-8' // Application charset must be UTF-8 |