From: Alexia E. Smith Date: Thu, 11 Sep 2014 20:11:19 +0000 (+0000) Subject: Make image/vnd.microsoft.icon be an alias for image/x-icon mime type. X-Git-Tag: 1.31.0-rc.0~14024^2 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f1e29e20be907b74ca252c4acb1069729a4dd394;p=lhc%2Fweb%2Fwiklou.git Make image/vnd.microsoft.icon be an alias for image/x-icon mime type. The mime type .ico files is detected as image/vnd.microsoft.icon on some PHP installations. This fixes the issue by aliasing it to image/x-icon. Bug: 69437 Change-Id: I1fdb4c7058546d6cdd47b1961706ef84a05dd360 --- diff --git a/includes/mime.info b/includes/mime.info index b86d7d7ab7..07b2495463 100644 --- a/includes/mime.info +++ b/includes/mime.info @@ -13,7 +13,7 @@ image/jpeg [BITMAP] image/jp2 [BITMAP] image/xbm [BITMAP] image/tiff [BITMAP] -image/x-icon image/x-ico [BITMAP] +image/x-icon image/x-ico image/vnd.microsoft.icon [BITMAP] image/x-rgb [BITMAP] image/x-portable-pixmap [BITMAP] image/x-portable-graymap image/x-portable-greymap [BITMAP] diff --git a/includes/mime.types b/includes/mime.types index ae6ca4d9e1..75017db2b5 100644 --- a/includes/mime.types +++ b/includes/mime.types @@ -91,6 +91,7 @@ image/png png apng image/svg+xml svg image/tiff tiff tif image/vnd.djvu djvu djv +image/vnd.microsoft.icon ico image/vnd.wap.wbmp wbmp image/webp webp image/x-cmu-raster ras