summaryrefslogtreecommitdiffstats
path: root/system/libraries/Zip.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2022-01-09 11:31:26 +0100
committerFlorian Pritz <bluewind@xinu.at>2022-01-09 11:31:26 +0100
commit5fb561ed3d972659213de47cb67fdc094adfbc1e (patch)
treefebd9f7e45d93801c2207691532cad144a848179 /system/libraries/Zip.php
parent82141c4baf5a1436b6eca8b1efa6e2bff3991179 (diff)
parentad57720c57c11620c77181655d637a5bfdbe2643 (diff)
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Zip.php')
-rw-r--r--system/libraries/Zip.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index e99873ae7..44586697a 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -119,7 +119,7 @@ class CI_Zip {
*/
public function __construct()
{
- 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->now = time();
log_message('info', 'Zip Compression Class Initialized');