From f8619870eae323098a47eb880e570f1c6eca37ff Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Mon, 14 Sep 2015 17:40:30 +0100 Subject: [PATCH] Remove get_temp_dir() --- lib/base.php | 8 -------- lib/private/preview/office.php | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/base.php b/lib/base.php index 5f8a7ed0f1..1e353df86d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1116,14 +1116,6 @@ class OC { return true; } - /** - * Get the temporary dir to store uploaded data - * @return null|string Path to the temporary directory or null - */ - function get_temp_dir() { - return \OC::$server->getTempManager()->t_get_temp_dir(); - } - } diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 30398147aa..ac6b4afa0c 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -36,7 +36,7 @@ abstract class Office extends Provider { $absPath = $fileview->toTmpFile($path); - $tmpDir = get_temp_dir(); + $tmpDir = \OC::$server->getTempManager()->getTempBaseDir(); $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);