Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2021-09-13 02:48:03 +02:00
commit 549a3baa76

View File

@ -239,11 +239,19 @@ fclose($fp);
if (empty($buildzip)) { if (empty($buildzip)) {
print "File ".$outputfile." generated\n"; print "File ".$outputfile." generated\n";
} else { } else {
if ($buildzip == '1' || $buildzip == 'zip') {
$result = dol_compress_file($outputfile, $outputfile.'.zip', 'zip'); $result = dol_compress_file($outputfile, $outputfile.'.zip', 'zip');
if ($result > 0) { if ($result > 0) {
dol_delete_file($outputfile); dol_delete_file($outputfile);
print "File ".$outputfile.".zip generated\n"; print "File ".$outputfile.".zip generated\n";
} }
} elseif ($buildzip == '2' || $buildzip == 'gz') {
$result = dol_compress_file($outputfile, $outputfile.'.gz', 'gz');
if ($result > 0) {
dol_delete_file($outputfile);
print "File ".$outputfile.".gz generated\n";
}
}
} }
exit(0); exit(0);