From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 28 Jan 2015 15:30:42 +0000 (+0100)
Subject: Make sure we delete the file when doing a cross storage trashbin move
X-Git-Tag: v8.0.0RC1~2^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=215388f4e06ab229ffaccc052f8d2b07faa45892;p=nextcloud-server.git

Make sure we delete the file when doing a cross storage trashbin move
---

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;