diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-09-07 16:29:39 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-09-09 12:17:27 +0000 |
| commit | b3c5271c89b6120b0407484895e8f975958d33c7 (patch) | |
| tree | 6b3acf77a07e5d41e7dbf3ef301dcd69fbd0a5a2 /lib/private/Files | |
| parent | 1ed0a8caced114f5ddaea2eed02e37727cb58a95 (diff) | |
| download | nextcloud-server-b3c5271c89b6120b0407484895e8f975958d33c7.tar.gz nextcloud-server-b3c5271c89b6120b0407484895e8f975958d33c7.zip | |
Properly add both mimetypes to secure mimetype mapping
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Type/Detection.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index 1352963fc67..4e7f89778a4 100644 --- a/lib/private/Files/Type/Detection.php +++ b/lib/private/Files/Type/Detection.php @@ -120,8 +120,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]; + } } } |