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/libraries/Session | |
| parent | f565212c5aa07a8016394a3bc66874be83c73d4d (diff) | |
More byte-safety
Diffstat (limited to 'system/libraries/Session')
| -rw-r--r-- | system/libraries/Session/drivers/Session_files_driver.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php index 6016e094e..8860ef667 100644 --- a/system/libraries/Session/drivers/Session_files_driver.php +++ b/system/libraries/Session/drivers/Session_files_driver.php @@ -84,11 +84,11 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle protected $_sid_regexp; /** - * mbstring.func_override flag + * mbstring.func_overload flag * * @var bool */ - protected static $func_override; + protected static $func_overload; // ------------------------------------------------------------------------ @@ -115,7 +115,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle $this->_sid_regexp = $this->_config['_sid_regexp']; - 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')); } // ------------------------------------------------------------------------ @@ -399,7 +399,7 @@ class CI_Session_files_driver extends CI_Session_driver implements SessionHandle */ protected static function strlen($str) { - return (self::$func_override) + return (self::$func_overload) ? mb_strlen($str, '8bit') : strlen($str); } |