diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-19 14:26:35 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-01-19 14:26:35 +0100 |
| commit | c0c74d5201c171cd6d0cdc2133e63077ebe1a407 (patch) | |
| tree | 0dd88740ced31cfd122b207b3a00559edadcb79c /system/core/Output.php | |
| parent | f565212c5aa07a8016394a3bc66874be83c73d4d (diff) | |
More byte-safety
Diffstat (limited to 'system/core/Output.php')
| -rw-r--r-- | system/core/Output.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 349955cd2..6ddded22a 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -123,11 +123,11 @@ class CI_Output { public $parse_exec_vars = TRUE; /** - * mbstring.func_override flag + * mbstring.func_overload flag * * @var bool */ - protected static $func_override; + protected static $func_overload; /** * Class constructor @@ -145,7 +145,7 @@ class CI_Output { && extension_loaded('zlib') ); - isset(self::$func_override) OR self::$func_override = (extension_loaded('mbstring') && ini_get('mbstring.func_override')); + isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload')); // Get mime types for later $this->mimes =& get_mimes(); @@ -817,7 +817,7 @@ class CI_Output { */ protected static function strlen($str) { - return (self::$func_override) + return (self::$func_overload) ? mb_strlen($str, '8bit') : strlen($str); } @@ -834,7 +834,7 @@ class CI_Output { */ protected static function substr($str, $start, $length = NULL) { - if (self::$func_override) + if (self::$func_overload) { // mb_substr($str, $start, null, '8bit') returns an empty // string on PHP 5.3 |