forked from extern/egroupware
remove system call used for PHP < 5.3.1
This commit is contained in:
parent
789080c663
commit
b5574da397
@ -1739,11 +1739,6 @@ abstract class Merge
|
||||
if ($zip->close() !== true) throw new Api\Exception("!ZipArchive::close()");
|
||||
unset($zip);
|
||||
unset($merged);
|
||||
if (substr($mimetype,0,35) == 'application/vnd.oasis.opendocument.' && // only open office archives need that, ms word files brake
|
||||
file_exists('/usr/bin/zip') && version_compare(PHP_VERSION,'5.3.1','<')) // fix broken zip archives generated by current php
|
||||
{
|
||||
exec('/usr/bin/zip -F '.escapeshellarg($archive));
|
||||
}
|
||||
if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
|
||||
$header['filesize'] = filesize($archive);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user