From aeb20675dd9679331b0de8f7ebf72ed0b0815742 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 22 Sep 2015 14:39:02 +0100
Subject: [PATCH] Allow recursive mimetype aliases
application/xml -> text/html -> text/code
---
core/js/mimetype.js | 2 +-
lib/private/files/type/detection.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/js/mimetype.js b/core/js/mimetype.js
index d22b0a2378..b0de8eb841 100644
--- a/core/js/mimetype.js
+++ b/core/js/mimetype.js
@@ -70,7 +70,7 @@ OC.MimeType = {
return undefined;
}
- if (mimeType in OC.MimeTypeList.aliases) {
+ while (mimeType in OC.MimeTypeList.aliases) {
mimeType = OC.MimeTypeList.aliases[mimeType];
}
if (mimeType in OC.MimeType._mimeTypeIcons) {
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 0c647ab44c..dc8aff2f30 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -269,7 +269,7 @@ class Detection implements IMimeTypeDetector {
public function mimeTypeIcon($mimetype) {
$this->loadAliases();
- if (isset($this->mimeTypeAlias[$mimetype])) {
+ while (isset($this->mimeTypeAlias[$mimetype])) {
$mimetype = $this->mimeTypeAlias[$mimetype];
}
if (isset($this->mimetypeIcons[$mimetype])) {
--
GitLab