diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
| commit | 27af930d4ed1daf9f2710b005d103c7f1c7d919d (patch) | |
| tree | ffe257a549ae70749dcf4646695a0d73535e237e /system/core/Utf8.php | |
| parent | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (diff) | |
| parent | 928b9aa6340654b1dbb69af44c41468456f0b7b6 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/core/Utf8.php')
| -rw-r--r-- | system/core/Utf8.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/system/core/Utf8.php b/system/core/Utf8.php index 122020aea..0a7ec501c 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -42,6 +42,8 @@ class CI_Utf8 { * Constructor * * Determines if UTF-8 support is to be enabled + * + * @return void */ public function __construct() { @@ -52,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 ) { @@ -124,7 +126,7 @@ class CI_Utf8 { * Attempts to convert a string to UTF-8 * * @param string - * @param string - input encoding + * @param string input encoding * @return string */ public function convert_to_utf8($str, $encoding) |