Merge pull request #9784 from josh4trunks/libreoffice_match_cl

Cleanup Document Preview
12 years ago · 539d2b7ec3
parent 1b5d31adc7 acd5660492
commit 539d2b7ec3
1 changed files with 2 additions and 3 deletions
--- 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{