wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21543 from owncloud/Larzenegger-master

Browse source 
[CI] Larzenegger master
This commit is contained in:
Thomas Müller 2016-01-15 13:29:57 +01:00
commit 41106c1967
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/tempmanager.php
View file

@ -225,11 +225,6 @@ class TempManager implements ITempManager {
if ($temp = getenv('TMPDIR')) {
$directories[] = $temp;
}
$temp = tempnam(__FILE__, '');
if (file_exists($temp)) {
unlink($temp);
$directories[] = dirname($temp);
}
if ($temp = sys_get_temp_dir()) {
$directories[] = $temp;
}
@ -239,6 +234,12 @@ class TempManager implements ITempManager {
return $dir;
}
}
$temp = tempnam(dirname(__FILE__), '');
if (file_exists($temp)) {
unlink($temp);
return dirname($temp);
}
throw new \UnexpectedValueException('Unable to detect system temporary directory');
}