Properly delete empty directories in Trashbin

Instead of checking delted file size, we do a real check.

this fixes #1688

diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 7a6bd1342ea278ea53d29f66d17ef4f31cd42ecf..f41482bef5553a2f303f39fcb4b32b638deab337 100644 (file)
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -15,7 +15,9 @@ if ($path_parts['dirname'] == '.') {
        $timestamp = null;
 }
 
-if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) {
+OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp);
+
+if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) {
        OCP\JSON::success(array("data" => array("filename" => $file)));
 } else {
        $l = OC_L10N::get('files_trashbin');