Allow recursive mimetype aliases

application/xml -> text/html -> text/code
10 years ago · aeb20675dd
parent cd7aff47e1
commit aeb20675dd
2 changed files with 2 additions and 2 deletions
--- 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) {
--- 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])) {