From 885c7e277d190ee606a7d4cf57a4991ec232fa6b Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 4 Aug 2017 09:05:16 -0400 Subject: PLT-7261 Fixed incorrect content type for preview and thumbnail images (#7119) --- api4/file.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'api4') diff --git a/api4/file.go b/api4/file.go index 4b39a1812..0607c1942 100644 --- a/api4/file.go +++ b/api4/file.go @@ -17,6 +17,9 @@ import ( const ( FILE_TEAM_ID = "noteam" + + PREVIEW_IMAGE_TYPE = "image/jpeg" + THUMBNAIL_IMAGE_TYPE = "image/jpeg" ) var UNSAFE_CONTENT_TYPES = [...]string{ @@ -165,7 +168,7 @@ func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) { if data, err := app.ReadFile(info.ThumbnailPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound - } else if err := writeFileResponse(info.Name, info.MimeType, data, forceDownload, w, r); err != nil { + } else if err := writeFileResponse(info.Name, THUMBNAIL_IMAGE_TYPE, data, forceDownload, w, r); err != nil { c.Err = err return } @@ -237,7 +240,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) { if data, err := app.ReadFile(info.PreviewPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound - } else if err := writeFileResponse(info.Name, info.MimeType, data, forceDownload, w, r); err != nil { + } else if err := writeFileResponse(info.Name, PREVIEW_IMAGE_TYPE, data, forceDownload, w, r); err != nil { c.Err = err return } -- cgit v1.2.3-1-g7c22