]> source.dussan.org Git - nextcloud-server.git/commitdiff
Make sure we delete the file when doing a cross storage trashbin move
authorRobin Appelman <icewind@owncloud.com>
Wed, 28 Jan 2015 15:30:42 +0000 (16:30 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 29 Jan 2015 14:40:01 +0000 (15:40 +0100)
apps/files_trashbin/lib/storage.php

index 21b4e56d0bbbbad2f682e5791b472cea46091954..019fd490b525c0ce6d1dda8b4447be6265fb940e 100644 (file)
@@ -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;