lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21492 from atm-GregM/FIX_dol_compress_dir_relativePath

Browse Source 
FIX dol_compress_dir names files on archives
This commit is contained in:
Laurent Destailleur 2022-08-11 02:13:17 +02:00 committed by GitHub
commit c21597e839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/files.lib.php
View File

@ -2193,7 +2193,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
if (!$file->isDir()) { if (!$file->isDir()) {
// Get real and relative path for current file // Get real and relative path for current file
$filePath = $file->getRealPath(); $filePath = $file->getRealPath();
$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1); $relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen(realpath($inputdir)) + 1);
if (empty($excludefiles) || !preg_match($excludefiles, $filePath)) { if (empty($excludefiles) || !preg_match($excludefiles, $filePath)) {
// Add current file to archive // Add current file to archive