summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-09-22 14:39:02 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2015-10-02 15:28:23 +0200
commitaeb20675dd9679331b0de8f7ebf72ed0b0815742 (patch)
treedc38667aff4e93c7388b15ed02c821499237baee /core
parentcd7aff47e163c1213e072af02fbbeafa11cf64e1 (diff)
downloadnextcloud-server-aeb20675dd9679331b0de8f7ebf72ed0b0815742.tar.gz
nextcloud-server-aeb20675dd9679331b0de8f7ebf72ed0b0815742.zip
Allow recursive mimetype aliases
application/xml -> text/html -> text/code
Diffstat (limited to 'core')
-rw-r--r--core/js/mimetype.js2
1 files changed, 1 insertions, 1 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) {