summaryrefslogtreecommitdiffstats
path: root/lib/private/preview
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-09-08 16:41:26 +0200
committerLukas Reschke <lukas@owncloud.com>2014-09-08 16:41:26 +0200
commit5de404eb926f0905fd9bae938939dbb4dadfd639 (patch)
tree246e579f038c348e71452484d6a0c456d07c635b /lib/private/preview
parentbca57b4b2856907ae297ca35fc8bdf6ef6567603 (diff)
parenteaab067716ed7f502bb267cad9704b0597669010 (diff)
downloadnextcloud-server-5de404eb926f0905fd9bae938939dbb4dadfd639.tar.gz
nextcloud-server-5de404eb926f0905fd9bae938939dbb4dadfd639.zip
Merge pull request #10827 from oparoz/patch-2
Libreoffice config folder needs to be set
Diffstat (limited to 'lib/private/preview')
-rw-r--r--lib/private/preview/office-cl.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index 81e0cf4b6ae..42d2cbf34fc 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -29,7 +29,7 @@ if (!\OC_Util::runningOnWindows()) {
$tmpDir = get_temp_dir();
- $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir) . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
+ $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId().'/') . ' --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);