Merge branch 'develop' into patch-11
This commit is contained in:
commit
31cd3d7eb2
1 changed files with 2 additions and 1 deletions
|
|
@ -165,13 +165,14 @@ if ($compression == 'zip') {
|
|||
}
|
||||
}
|
||||
|
||||
$ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip);
|
||||
$ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip); // Can modify $errormsg
|
||||
if ($ret < 0) {
|
||||
if ($ret == -2) {
|
||||
$langs->load("errors");
|
||||
$errormsg = $langs->trans("ErrNoZipEngine");
|
||||
} else {
|
||||
$langs->load("errors");
|
||||
// @phpstan-ignore-next-line The $errormsg can have been modified by the dol_compress_dir function.
|
||||
$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir).($errormsg ? "\n" . $errormsg : "");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue