From f1e29e20be907b74ca252c4acb1069729a4dd394 Mon Sep 17 00:00:00 2001 From: "Alexia E. Smith" Date: Thu, 11 Sep 2014 20:11:19 +0000 Subject: [PATCH] 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 --- includes/mime.info | 2 +- includes/mime.types | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.20.1