From b5574da397d427c78af8d471320e71f6111068aa Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 31 Oct 2017 09:55:23 +0100 Subject: [PATCH] remove system call used for PHP < 5.3.1 --- api/src/Storage/Merge.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 197494a95a..c225a508f0 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -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); }