diff options
| author | Qingping Hou <dave2008713@gmail.com> | 2013-02-16 17:44:51 -0500 |
|---|---|---|
| committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-16 17:44:51 -0500 |
| commit | 4b4b1f86925248a36c4cc62e91905e605b891e70 (patch) | |
| tree | d1c0d08c6109a17aa9787be365b6657ea75bb738 /apps | |
| parent | 50759607e4a94c63ae02bf6302acd191913bc834 (diff) | |
| download | nextcloud-server-4b4b1f86925248a36c4cc62e91905e605b891e70.tar.gz nextcloud-server-4b4b1f86925248a36c4cc62e91905e605b891e70.zip | |
Properly delete empty directories in Trashbin
Instead of checking delted file size, we do a real check.
this fixes #1688
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/ajax/delete.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7a6bd1342ea..f41482bef55 100644 --- 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'); |