diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
| commit | 2fa66ba7c6840ac851ae7da2889e7fb654dcda07 (patch) | |
| tree | 70573048d629ecc51804507c7868356fad323860 /system/core/Output.php | |
| parent | efc96b71e4b1d13d713d8b2be01796b7d30e6f9b (diff) | |
| parent | 1d0315b6b3d7003bfb348ccaf7ee30d2533635de (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/core/Output.php')
| -rw-r--r-- | system/core/Output.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index bbad9f168..7f153ef77 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(); |