summaryrefslogtreecommitdiffstats
path: root/app/team.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
commit91557bbd978500388a11b99401783164e143a966 (patch)
tree676d6278d957df20f21d5e367d1f447ee281414e /app/team.go
parent11c60ea41afd419036edc54b5571f26ce680c93c (diff)
parent2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff)
downloadchat-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/team.go')
-rw-r--r--app/team.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/team.go b/app/team.go
index d8ebbab2a..2833e2eed 100644
--- a/app/team.go
+++ b/app/team.go
@@ -1057,7 +1057,7 @@ func (a *App) SetTeamIconFromFile(teamId string, file multipart.File) *model.App
path := "teams/" + teamId + "/teamIcon.png"
- if err := a.WriteFile(buf.Bytes(), path); err != nil {
+ if _, err := a.WriteFile(buf, path); err != nil {
return model.NewAppError("SetTeamIcon", "api.team.set_team_icon.write_file.app_error", nil, "", http.StatusInternalServerError)
}