зеркало из https://github.com/nextcloud/server.git
detect the correct mimetype of the files in the trashbin, therefore we have to check the filename without the appended timestamp
This commit is contained in:
Родитель
f6c7b4e6eb
Коммит
68b53669c0
|
@ -78,11 +78,12 @@ class Helper {
|
|||
$originalPath = substr($originalPath, 0, -1);
|
||||
}
|
||||
}
|
||||
$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
|
||||
$i = array(
|
||||
'name' => $name,
|
||||
'mtime' => $timestamp,
|
||||
'mimetype' => $entry->getMimeType(),
|
||||
'type' => $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file',
|
||||
'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
|
||||
'type' => $type,
|
||||
'directory' => ($dir === '/') ? '' : $dir,
|
||||
'size' => $entry->getSize(),
|
||||
'etag' => '',
|
||||
|
|
Загрузка…
Ссылка в новой задаче