diff options
author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-05-10 18:16:33 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-05-10 15:16:33 -0700 |
commit | 2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (patch) | |
tree | 3d3bf61a39534e8db4cffde9b9644c3ce895580c /app/user.go | |
parent | 7fa1c6c4bae19d1647d759198126ee4591282079 (diff) | |
download | chat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.tar.gz chat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.tar.bz2 chat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.zip |
MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)
This is a reworked set of changes originally from @josephGuo to begin
reducing the duplicated memory required when uploading files.
Diffstat (limited to 'app/user.go')
-rw-r--r-- | app/user.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/user.go b/app/user.go index 2b0442e75..2ee410684 100644 --- a/app/user.go +++ b/app/user.go @@ -754,7 +754,7 @@ func (a *App) GetProfileImage(user *model.User) ([]byte, bool, *model.AppError) } if user.LastPictureUpdate == 0 { - if err := a.WriteFile(img, path); err != nil { + if _, err := a.WriteFile(bytes.NewReader(img), path); err != nil { return nil, false, err } } @@ -810,7 +810,7 @@ func (a *App) SetProfileImageFromFile(userId string, file multipart.File) *model path := "users/" + userId + "/profile.png" - if err := a.WriteFile(buf.Bytes(), path); err != nil { + if _, err := a.WriteFile(buf, path); err != nil { return model.NewAppError("SetProfileImage", "api.user.upload_profile_user.upload_profile.app_error", nil, "", http.StatusInternalServerError) } |