summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-28 14:54:37 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-28 14:54:37 -0700
commit67ce2ad86985a94389be1edcf38ad037ec2caf7f (patch)
treed923539aa182702e81c3637d3ae8a35374474815
parentcebb635955c71895545ce7ff5bad7808b1e22c0e (diff)
parentaed71bb420c6700a75d22d8958977083acbcff46 (diff)
downloadnextcloud-server-67ce2ad86985a94389be1edcf38ad037ec2caf7f.tar.gz
nextcloud-server-67ce2ad86985a94389be1edcf38ad037ec2caf7f.zip
Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
also move empty folders to the trash bin
-rw-r--r--apps/files_trashbin/lib/trash.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 0dcb2fc82e1..880832f9afa 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -72,11 +72,6 @@ class Trashbin {
$mime = $view->getMimeType('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';
} else {
$type = 'file';