From eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 16 Nov 2017 15:04:27 -0600 Subject: Reorganize file util functionality (#7848) * reorganize file util functionality * fix api test compilation * fix rebase issue --- app/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/user.go') diff --git a/app/user.go b/app/user.go index 48237f300..358a87711 100644 --- a/app/user.go +++ b/app/user.go @@ -751,7 +751,7 @@ func (a *App) GetProfileImage(user *model.User) ([]byte, bool, *model.AppError) } else { path := "users/" + user.Id + "/profile.png" - if data, err := utils.ReadFile(path); err != nil { + if data, err := a.ReadFile(path); err != nil { readFailed = true if img, err = CreateProfileImage(user.Username, user.Id, a.Config().FileSettings.InitialFont); err != nil { @@ -759,7 +759,7 @@ func (a *App) GetProfileImage(user *model.User) ([]byte, bool, *model.AppError) } if user.LastPictureUpdate == 0 { - if err := utils.WriteFile(img, path); err != nil { + if err := a.WriteFile(img, path); err != nil { return nil, false, err } } @@ -812,7 +812,7 @@ func (a *App) SetProfileImage(userId string, imageData *multipart.FileHeader) *m path := "users/" + userId + "/profile.png" - if err := utils.WriteFile(buf.Bytes(), path); err != nil { + if err := a.WriteFile(buf.Bytes(), path); err != nil { return model.NewAppError("SetProfileImage", "api.user.upload_profile_user.upload_profile.app_error", nil, "", http.StatusInternalServerError) } -- cgit v1.2.3-1-g7c22