Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
also move empty folders to the trash bin
This commit is contained in:
commit
67ce2ad869
|
@ -72,11 +72,6 @@ class Trashbin {
|
||||||
$mime = $view->getMimeType('files' . $file_path);
|
$mime = $view->getMimeType('files' . $file_path);
|
||||||
|
|
||||||
if ($view->is_dir('files' . $file_path)) {
|
if ($view->is_dir('files' . $file_path)) {
|
||||||
$dirContent = $view->getDirectoryContent('files' . $file_path);
|
|
||||||
// no need to move empty folders to the trash bin
|
|
||||||
if (empty($dirContent)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
$type = 'dir';
|
$type = 'dir';
|
||||||
} else {
|
} else {
|
||||||
$type = 'file';
|
$type = 'file';
|
||||||
|
|
Loading…
Reference in New Issue