[Pkg-owncloud-commits] [owncloud] 01/78: Fix libre/openoffice preview on multi-user instances

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6a46ede8b7d40945d1d129ca2115bb9e399cf35b
Author: RealRancor <Fisch.666 at gmx.de>
Date:   Thu Feb 12 23:15:28 2015 +0100

    Fix libre/openoffice preview on multi-user instances
---
 lib/private/preview/office-cl.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index 6e4d432..f5c791e 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 . '/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);
-			$export = 'export HOME=/' . $tmpDir;
 
-			shell_exec($export . "\n" . $exec);
+			shell_exec($exec);
 
 			//create imagick object from pdf
 			try{

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git