diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-01-28 16:30:42 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-01-29 15:40:01 +0100 |
| commit | 215388f4e06ab229ffaccc052f8d2b07faa45892 (patch) | |
| tree | 76c250e513a6a770e0508ebb263e2106a9da2c42 /apps/files_trashbin | |
| parent | d4c4e2a3221bdba82c60e5428a5b151b4f21ad10 (diff) | |
| download | nextcloud-server-215388f4e06ab229ffaccc052f8d2b07faa45892.tar.gz nextcloud-server-215388f4e06ab229ffaccc052f8d2b07faa45892.zip | |
Make sure we delete the file when doing a cross storage trashbin move
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/storage.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php index 21b4e56d0bb..019fd490b52 100644 --- a/apps/files_trashbin/lib/storage.php +++ b/apps/files_trashbin/lib/storage.php @@ -85,6 +85,8 @@ class Storage extends Wrapper { $result = $this->storage->unlink($path); } unset($this->deletedFiles[$normalized]); + } else if ($this->storage->file_exists($path)) { + $result = $this->storage->unlink($path); } return $result; |