diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php index e882503766..64a7701011 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]; + } } } diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index c59dfaefd3..97b2f74ff0 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -134,7 +134,7 @@ "pdf": ["application/pdf"], "pfb": ["application/x-font"], "pef": ["image/x-dcraw"], - "php": ["application/x-php"], + "php": ["application/x-php", "text/x-php"], "pl": ["application/x-perl"], "pls": ["audio/x-scpls"], "png": ["image/png"],