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

Merge pull request #3998 from nextcloud/backport-27032

Browse source 
Use the expected method depending on the target being a file or folder
This commit is contained in:
Roeland Jago Douma 2017-03-23 21:59:39 +01:00 committed by GitHub
commit 6e6cbae37c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_trashbin/lib/Trashbin.php
View file

@ -256,7 +256,11 @@ class Trashbin {
}
if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
$sourceStorage->unlink($sourceInternalPath);
if ($sourceStorage->is_dir($sourceInternalPath)) {
$sourceStorage->rmdir($sourceInternalPath);
} else {
$sourceStorage->unlink($sourceInternalPath);
}
return false;
}