From df101b963452718c23dea55f76a43cb3f9d55194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 9 Jan 2024 14:30:41 +0100 Subject: [PATCH] dol_compress_dir creates invalid zip with windoze --- htdocs/core/lib/files.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index e90dd1f19e5..25b36663738 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -4,7 +4,7 @@ * Copyright (C) 2012-2016 Juanjo Menent * Copyright (C) 2015 Marcos García * Copyright (C) 2016 Raphaël Doursenaud - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019-2024 Frédéric France * Copyright (C) 2023 Lenin Rivas * * This program is free software; you can redistribute it and/or modify @@ -2218,7 +2218,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring // Create recursive directory iterator /** @var SplFileInfo[] $files */ $files = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($rootPath), + new RecursiveDirectoryIterator($rootPath, FilesystemIterator::UNIX_PATHS), RecursiveIteratorIterator::LEAVES_ONLY ); @@ -2481,7 +2481,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = // This does not return symbolic links /** @var SplFileInfo[] $files */ $files = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($inputdir), + new RecursiveDirectoryIterator($inputdir, FilesystemIterator::UNIX_PATHS), RecursiveIteratorIterator::LEAVES_ONLY );