diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-15 14:18:29 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-15 14:18:29 +0200 |
commit | decdaf001855060862817e47d2a8d3d7dbb64043 (patch) | |
tree | 45aa50813ef44d0419cfe4ede723c51ed1a745b0 /lib | |
parent | 474f13c9d631aae8b9001156f6a26defde413190 (diff) | |
parent | f8619870eae323098a47eb880e570f1c6eca37ff (diff) | |
download | nextcloud-server-decdaf001855060862817e47d2a8d3d7dbb64043.tar.gz nextcloud-server-decdaf001855060862817e47d2a8d3d7dbb64043.zip |
Merge pull request #19024 from owncloud/remove-get_temp_dir
Remove get_temp_dir()
Diffstat (limited to 'lib')
-rw-r--r-- | lib/base.php | 8 | ||||
-rw-r--r-- | lib/private/preview/office.php | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/base.php b/lib/base.php index fcb3ff0b561..f5ba05ded74 100644 --- a/lib/base.php +++ b/lib/base.php @@ -1117,14 +1117,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 30398147aa6..ac6b4afa0cc 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); |