Browse Source
dont update mimetype when moving to trash
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/22060/head
Robin Appelman
5 years ago
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
1 changed files with
5 additions and
1 deletions
-
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); |
|
|
|
|
