sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly add both mimetypes to secure mimetype mapping 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/22646/head
Julius Härtl 2020-09-07 16:29:39 +07:00
parent 16e1d1cb12
commit 5e4303b1fe
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Files/Type/Detection.php
Unescape Escape View File

@ -122,8 +122,14 @@ class Detection implements IMimeTypeDetector {
$this->mimetypes = array_merge($this->mimetypes, $types);
// Update the alternative mimetypes to avoid having to look them up each time.
foreach ($this->mimetypes as $mimeType) {
foreach ($this->mimetypes as $extension => $mimeType) {
if (strpos($extension, '_comment') === 0) {
continue;
}
$this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?? $mimeType[0];
if (isset($mimeType[1])) {
$this->secureMimeTypes[$mimeType[1]] = $mimeType[1];
}
}
}