diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 19:00:15 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 19:00:15 -0400 |
| commit | d2cc0c5834d6849f2fdb1e343ed5e193b742fa2f (patch) | |
| tree | b3add5519af5272451b391643e68b76858aa9aff /app/team.go | |
| parent | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (diff) | |
| parent | aa42ed8abae72ade1cb193027b06e6f19b579ddf (diff) | |
| download | chat-d2cc0c5834d6849f2fdb1e343ed5e193b742fa2f.tar.gz chat-d2cc0c5834d6849f2fdb1e343ed5e193b742fa2f.tar.bz2 chat-d2cc0c5834d6849f2fdb1e343ed5e193b742fa2f.zip | |
Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermost-server into advanced-permissions-phase-2
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/team.go b/app/team.go index 936c06868..4fc410934 100644 --- a/app/team.go +++ b/app/team.go @@ -388,8 +388,8 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId shouldBeAdmin := team.Email == user.Email // Soft error if there is an issue joining the default channels - if err := a.JoinDefaultChannels(team.Id, user, channelRole, userRequestorId); err != nil { - mlog.Error(fmt.Sprintf("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", user.Id, team.Id, err), mlog.String("user_id", user.Id)) + if err := a.JoinDefaultChannels(team.Id, user, shouldBeAdmin, userRequestorId); err != nil { + mlog.Error(fmt.Sprintf("Encountered an issue joining default channels err=%v", err), mlog.String("user_id", user.Id), mlog.String("team_id", team.Id)) } a.ClearSessionCacheForUser(user.Id) |