mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19024 from owncloud/remove-get_temp_dir 

Remove get_temp_dir()
This commit is contained in:
Thomas Müller 2015-09-15 14:18:29 +02:00
parent 474f13c9d6 f8619870ea
commit decdaf0018
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base.php
View File

@ -1117,14 +1117,6 @@ class OC {
return true; 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();
}
} }

2
lib/private/preview/office.php
View File

@ -36,7 +36,7 @@ abstract class Office extends Provider {
$absPath = $fileview->toTmpFile($path); $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 '; $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); $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);