diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-11 08:05:23 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-11 08:05:23 -0400 |
| commit | 91557bbd978500388a11b99401783164e143a966 (patch) | |
| tree | 676d6278d957df20f21d5e367d1f447ee281414e /app/emoji.go | |
| parent | 11c60ea41afd419036edc54b5571f26ce680c93c (diff) | |
| parent | 2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff) | |
| download | chat-91557bbd978500388a11b99401783164e143a966.tar.gz chat-91557bbd978500388a11b99401783164e143a966.tar.bz2 chat-91557bbd978500388a11b99401783164e143a966.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/emoji.go')
| -rw-r--r-- | app/emoji.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/emoji.go b/app/emoji.go index 2f957fbcc..b07331e65 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -98,7 +98,7 @@ func (a *App) UploadEmojiImage(id string, imageData *multipart.FileHeader) *mode if err := gif.EncodeAll(newbuf, resized_gif); err != nil { return model.NewAppError("uploadEmojiImage", "api.emoji.upload.large_image.gif_encode_error", nil, "", http.StatusBadRequest) } - if err := a.WriteFile(newbuf.Bytes(), getEmojiImagePath(id)); err != nil { + if _, err := a.WriteFile(newbuf, getEmojiImagePath(id)); err != nil { return err } } @@ -110,14 +110,15 @@ func (a *App) UploadEmojiImage(id string, imageData *multipart.FileHeader) *mode if err := png.Encode(newbuf, resized_image); err != nil { return model.NewAppError("uploadEmojiImage", "api.emoji.upload.large_image.encode_error", nil, "", http.StatusBadRequest) } - if err := a.WriteFile(newbuf.Bytes(), getEmojiImagePath(id)); err != nil { + if _, err := a.WriteFile(newbuf, getEmojiImagePath(id)); err != nil { return err } } } } - return a.WriteFile(buf.Bytes(), getEmojiImagePath(id)) + _, appErr := a.WriteFile(buf, getEmojiImagePath(id)) + return appErr } func (a *App) DeleteEmoji(emoji *model.Emoji) *model.AppError { |