diff options
| author | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
| commit | 5fb561ed3d972659213de47cb67fdc094adfbc1e (patch) | |
| tree | febd9f7e45d93801c2207691532cad144a848179 /system/libraries/Email.php | |
| parent | 82141c4baf5a1436b6eca8b1efa6e2bff3991179 (diff) | |
| parent | ad57720c57c11620c77181655d637a5bfdbe2643 (diff) | |
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index dcc4ca0d3..6c453da3f 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -397,7 +397,7 @@ class CI_Email { $this->initialize($config); $this->_safe_mode = ( ! is_php('5.4') && ini_get('safe_mode')); - 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')); log_message('info', 'Email Class Initialized'); } |