summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-11-18 18:59:34 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-11-18 18:59:34 +0100
commit81d112fb428719bbb4a821cb90397772ab1c6eaf (patch)
tree0c028c5be9db99cd25354af54272c8767658bffd
parent3b0a7574d6d48eba1e2e047886fe4aa630948005 (diff)
parentcb118ce3710676fa95b02d8f5057e3842d723f53 (diff)
downloadnextcloud-server-81d112fb428719bbb4a821cb90397772ab1c6eaf.tar.gz
nextcloud-server-81d112fb428719bbb4a821cb90397772ab1c6eaf.zip
Merge pull request #12261 from oparoz/patch-1
Replace deprecated switches
-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 42d2cbf34fc..f5c791e37f2 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 . '/owncloud-' . \OC_Util::getInstanceId().'/') . ' --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);