upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 06:37:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Allow recursive mimetype aliases

Browse source 
application/xml -> text/html -> text/code
This commit is contained in:
Robin McCorkell 2015-09-22 14:39:02 +01:00 committed by Roeland Jago Douma
parent cd7aff47e1
commit aeb20675dd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/mimetype.js
View file

@ -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) {

2
lib/private/files/type/detection.php
View file

@ -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])) {