upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Use the expected method depending on the target being a file or folder

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Juan Pablo Villafáñez 2017-01-25 17:21:20 +01:00 committed by Morris Jobke
parent d551b8e6fd
commit 713faa0fc0
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
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;
}