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

Merge pull request #3892 from nextcloud/downstream-27101 

Redirect unlink to rmdir
This commit is contained in:
Joas Schilling 2017-03-17 13:56:36 +01:00 committed by GitHub
parent 0c0ce25b3c 70bd819dd2
commit 26eda9dd58
2 changed files with 293 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/View.php
View File

@ -692,7 +692,11 @@ class View {
if ($mount and $mount->getInternalPath($absolutePath) === '') {
return $this->removeMount($mount, $absolutePath);
}
$result = $this->basicOperation('unlink', $path, array('delete'));
if ($this->is_dir($path)) {
$result = $this->basicOperation('rmdir', $path, ['delete']);
} else {
$result = $this->basicOperation('unlink', $path, ['delete']);
}
if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
$storage = $mount->getStorage();
$internalPath = $mount->getInternalPath($absolutePath);

541
tests/lib/Files/ViewTest.php
View File

File diff suppressed because it is too large Load Diff