diff options
| author | George Goldberg <george@gberg.me> | 2018-06-12 10:48:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 10:48:45 +0100 |
| commit | 4ea7f6a2f7e61356996a3dfa85169f8db5d4d064 (patch) | |
| tree | 2d68a4d666225daa72ee62f2bc09c3b55a6ee1ed /app/import.go | |
| parent | 9517cccab017f67db973ef4a601de68656ce1713 (diff) | |
| download | chat-4ea7f6a2f7e61356996a3dfa85169f8db5d4d064.tar.gz chat-4ea7f6a2f7e61356996a3dfa85169f8db5d4d064.tar.bz2 chat-4ea7f6a2f7e61356996a3dfa85169f8db5d4d064.zip | |
MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937)
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/import.go b/app/import.go index 8075497a0..5364b1026 100644 --- a/app/import.go +++ b/app/import.go @@ -1699,10 +1699,12 @@ func (a *App) OldImportFile(timestamp time.Time, file io.Reader, teamId string, return nil, err } - img, width, height := prepareImage(data) - if img != nil { - a.generateThumbnailImage(*img, fileInfo.ThumbnailPath, width, height) - a.generatePreviewImage(*img, fileInfo.PreviewPath, width) + if fileInfo.IsImage() && fileInfo.MimeType != "image/svg+xml" { + img, width, height := prepareImage(data) + if img != nil { + a.generateThumbnailImage(*img, fileInfo.ThumbnailPath, width, height) + a.generatePreviewImage(*img, fileInfo.PreviewPath, width) + } } return fileInfo, nil |