Merge pull request #22746 from nextcloud/backport/22646/stable18

[stable18] Fix detecting text/x-php mimetype and secure mimetype mapping

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];
+			}
 		}
 	}