diff options
| author | George Goldberg <george@gberg.me> | 2017-04-04 18:19:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 18:19:42 +0100 |
| commit | 32460bf63bc07c69ee5da0bb5640b879facb5538 (patch) | |
| tree | 2ee6abc94175823632e9f9ab40172948fcfa0f85 /app/import.go | |
| parent | 0b5c0794fdcbb551c1233dcdfbdf5c7deb585fd6 (diff) | |
| download | chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.gz chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.bz2 chat-32460bf63bc07c69ee5da0bb5640b879facb5538.zip | |
PLT-6198: Use added to channel system message on default channels. (#5969)
Use a different sytem message when a user was added to a default channel
by someone else than when they joined themselves.
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/import.go b/app/import.go index 8d1173c31..6bf4e8a89 100644 --- a/app/import.go +++ b/app/import.go @@ -865,7 +865,7 @@ func OldImportUser(team *model.Team, user *model.User) *model.User { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } - if err := JoinUserToTeam(team, user); err != nil { + if err := JoinUserToTeam(team, user, ""); err != nil { l4g.Error(utils.T("api.import.import_user.join_team.error"), err) } |