diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-01-05 12:57:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-01-05 12:57:33 +0100 |
| commit | 318c485b7b83356543c9aa7ab65464893d7eb8fe (patch) | |
| tree | 4ac393b148f4b16dfae707aaf1e344ad00fb182a /system/core | |
| parent | 9c5227c56f9c29729659951b2ac3df9e8a87d5b5 (diff) | |
Close #6021: Suppress possible E_DEPRECATION notices about mbstring.func_overload
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Log.php | 2 | ||||
| -rw-r--r-- | system/core/Output.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Log.php b/system/core/Log.php index f66f1aa48..683c16bac 100644 --- a/system/core/Log.php +++ b/system/core/Log.php @@ -122,7 +122,7 @@ class CI_Log { { $config =& get_config(); - isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload')); + isset(self::$func_overload) OR self::$func_overload = ( ! is_php('8.0') && extension_loaded('mbstring') && @ini_get('mbstring.func_overload')); $this->_log_path = ($config['log_path'] !== '') ? $config['log_path'] : APPPATH.'logs/'; $this->_file_ext = (isset($config['log_file_extension']) && $config['log_file_extension'] !== '') diff --git a/system/core/Output.php b/system/core/Output.php index 93d85e798..8e3245b79 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -145,7 +145,7 @@ class CI_Output { && extension_loaded('zlib') ); - isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload')); + isset(self::$func_overload) OR self::$func_overload = ( ! is_php('8.0') && extension_loaded('mbstring') && @ini_get('mbstring.func_overload')); // Get mime types for later $this->mimes =& get_mimes(); |