mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix renameFromStorage messing with folder mimetype 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2020-07-23 20:31:35 +02:00 committed by backportbot[bot]
parent 7ac4d57fd5
commit 142b6eb08f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/Files/Cache/Updater.php
View File

@ -28,6 +28,7 @@
namespace OC\Files\Cache; namespace OC\Files\Cache;
use OC\Files\FileInfo;
use OCP\Files\Cache\ICacheEntry; use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Cache\IUpdater; use OCP\Files\Cache\IUpdater;
use OCP\Files\Storage\IStorage; use OCP\Files\Storage\IStorage;
@ -187,7 +188,9 @@ class Updater implements IUpdater {
$sourceUpdater = $sourceStorage->getUpdater(); $sourceUpdater = $sourceStorage->getUpdater();
$sourcePropagator = $sourceStorage->getPropagator(); $sourcePropagator = $sourceStorage->getPropagator();
if ($sourceCache->inCache($source)) { $sourceInfo = $sourceCache->get($source);
if ($sourceInfo !== false) {
if ($this->cache->inCache($target)) { if ($this->cache->inCache($target)) {
$this->cache->remove($target); $this->cache->remove($target);
} }
@ -197,13 +200,13 @@ class Updater implements IUpdater {
} else { } else {
$this->cache->moveFromCache($sourceCache, $source, $target); $this->cache->moveFromCache($sourceCache, $source, $target);
} }
}
if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION)) { if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION) && $sourceInfo->getMimeType() !== FileInfo::MIMETYPE_FOLDER) {
// handle mime type change // handle mime type change
$mimeType = $this->storage->getMimeType($target); $mimeType = $this->storage->getMimeType($target);
$fileId = $this->cache->getId($target); $fileId = $this->cache->getId($target);
$this->cache->update($fileId, ['mimetype' => $mimeType]); $this->cache->update($fileId, ['mimetype' => $mimeType]);
}
} }
if ($sourceCache instanceof Cache) { if ($sourceCache instanceof Cache) {