dont update mimetype when moving to trash

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php
index 7c222b310326b8cdfee55ca3a1d2ab34a7cba6ef..b5d8fd0054fb7af6b691ba104c93e317118997e7 100644 (file)
--- a/lib/private/Files/Cache/Updater.php
+++ b/lib/private/Files/Cache/Updater.php
@@ -201,7 +201,11 @@ class Updater implements IUpdater {
                                $this->cache->moveFromCache($sourceCache, $source, $target);
                        }
 
-                       if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION) && $sourceInfo->getMimeType() !== FileInfo::MIMETYPE_FOLDER) {
+                       $sourceExtension = pathinfo($source, PATHINFO_EXTENSION);
+                       $targetExtension = pathinfo($target, PATHINFO_EXTENSION);
+                       $targetIsTrash = preg_match("/d\d+/", $targetExtension);
+
+                       if ($sourceExtension !== $targetExtension && $sourceInfo->getMimeType() !== FileInfo::MIMETYPE_FOLDER && !$targetIsTrash) {
                                // handle mime type change
                                $mimeType = $this->storage->getMimeType($target);
                                $fileId = $this->cache->getId($target);