diff options
| author | Olivier Paroz <oparoz@users.noreply.github.com> | 2014-09-03 03:12:35 +0200 |
|---|---|---|
| committer | Olivier Paroz <oparoz@users.noreply.github.com> | 2014-09-03 03:12:35 +0200 |
| commit | 0c3c72aec02003cf09b3d2d1d8fcdb083f1e6db1 (patch) | |
| tree | d73ca56dbfb2876cc0c96af1e295399a1400abc9 /lib/private/preview | |
| parent | 70c54d485ae9ca54a0bf4eb69ac2d71d65573597 (diff) | |
| download | nextcloud-server-0c3c72aec02003cf09b3d2d1d8fcdb083f1e6db1.tar.gz nextcloud-server-0c3c72aec02003cf09b3d2d1d8fcdb083f1e6db1.zip | |
Libreoffice config folder needs to be set
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.
Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid
Diffstat (limited to 'lib/private/preview')
| -rw-r--r-- | lib/private/preview/office-cl.php | 2 |
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..2df189f4dbf 100644 --- a/lib/private/preview/office-cl.php +++ b/lib/private/preview/office-cl.php @@ -32,7 +32,7 @@ if (!\OC_Util::runningOnWindows()) { $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); + $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath) . ' -env:UserInstallation=file://' . escapeshellarg(get_temp_dir() . '/owncloud-' . \OC_Util::getInstanceId().'/'); shell_exec($exec); |