diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-28 13:03:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-07-28 13:03:33 +0200 |
| commit | 539d2b7ec361bb4299a631f5d0980c482ffcb278 (patch) | |
| tree | 0c621bd49e3648c3ce7ad432fadd6cfcd3043c99 | |
| parent | 1b5d31adc7ef184bf2185cf351d0906187254f7a (diff) | |
| parent | acd56604928d5797e00b9ddaa11453cbeacfd4f2 (diff) | |
| download | nextcloud-server-539d2b7ec361bb4299a631f5d0980c482ffcb278.tar.gz nextcloud-server-539d2b7ec361bb4299a631f5d0980c482ffcb278.zip | |
Merge pull request #9784 from josh4trunks/libreoffice_match_cl
Cleanup Document Preview
| -rw-r--r-- | lib/private/preview/office-cl.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php index 6e4d4321eb7..81e0cf4b6ae 100644 --- a/lib/private/preview/office-cl.php +++ b/lib/private/preview/office-cl.php @@ -29,13 +29,12 @@ if (!\OC_Util::runningOnWindows()) { $tmpDir = get_temp_dir(); - $defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir '; + $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir) . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir '; $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters); $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath); - $export = 'export HOME=/' . $tmpDir; - shell_exec($export . "\n" . $exec); + shell_exec($exec); //create imagick object from pdf try{ |