diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-03-24 10:04:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-03-24 10:04:53 +0100 |
| commit | c7c0bdf4f7af7c4e71b073ee87ddb792087bdfac (patch) | |
| tree | 5cfb825e1e0d67f30d4c8a91428cd52eb580695a /system/core/Log.php | |
| parent | 1d9aaee34ea77fdb68d79d7add37f26dd2649c00 (diff) | |
| parent | 0eb38af2eaf1127b9b82261b7ec3bf4d4b847318 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
system/core/Common.php
system/core/Input.php
system/helpers/cookie_helper.php
tests/codeigniter/helpers/html_helper_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/input.rst
Diffstat (limited to 'system/core/Log.php')
| -rw-r--r-- | system/core/Log.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/core/Log.php b/system/core/Log.php index 67b315b6b..dd6ab8b90 100644 --- a/system/core/Log.php +++ b/system/core/Log.php @@ -105,11 +105,11 @@ class CI_Log { protected $_levels = array('ERROR' => 1, 'DEBUG' => 2, 'INFO' => 3, 'ALL' => 4); /** - * mbstring.func_override flag + * mbstring.func_overload flag * * @var bool */ - protected static $func_override; + protected static $func_overload; // -------------------------------------------------------------------- @@ -122,7 +122,7 @@ class CI_Log { { $config =& get_config(); - 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')); $this->_log_path = ($config['log_path'] !== '') ? rtrim($config['log_path'], '/\\').DIRECTORY_SEPARATOR : APPPATH.'logs'.DIRECTORY_SEPARATOR; @@ -266,7 +266,7 @@ class CI_Log { */ protected static function strlen($str) { - return (self::$func_override) + return (self::$func_overload) ? mb_strlen($str, '8bit') : strlen($str); } @@ -283,7 +283,7 @@ class CI_Log { */ protected static function substr($str, $start, $length = NULL) { - if (self::$func_override) + if (self::$func_overload) { return mb_substr($str, $start, $length, '8bit'); } |