diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-22 14:39:02 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-10-02 15:28:23 +0200 |
| commit | aeb20675dd9679331b0de8f7ebf72ed0b0815742 (patch) | |
| tree | dc38667aff4e93c7388b15ed02c821499237baee | |
| parent | cd7aff47e163c1213e072af02fbbeafa11cf64e1 (diff) | |
| download | nextcloud-server-aeb20675dd9679331b0de8f7ebf72ed0b0815742.tar.gz nextcloud-server-aeb20675dd9679331b0de8f7ebf72ed0b0815742.zip | |
Allow recursive mimetype aliases
application/xml -> text/html -> text/code
| -rw-r--r-- | core/js/mimetype.js | 2 | ||||
| -rw-r--r-- | 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 d22b0a2378a..b0de8eb8411 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 0c647ab44c6..dc8aff2f30c 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])) { |