diff options
Diffstat (limited to 'api/import.go')
| -rw-r--r-- | api/import.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/import.go b/api/import.go index 7590277b0..c39ec5220 100644 --- a/api/import.go +++ b/api/import.go @@ -22,7 +22,7 @@ func ImportPost(post *model.Post) { } } -func ImportUser(user *model.User) *model.User { +func ImportUser(teamId string, user *model.User) *model.User { user.MakeNonNil() if result := <-Srv.Store.User().Save(user); result.Err != nil { @@ -31,8 +31,8 @@ func ImportUser(user *model.User) *model.User { } else { ruser := result.Data.(*model.User) - if err := JoinDefaultChannels(ruser, ""); err != nil { - l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, ruser.TeamId, err) + if err := JoinDefaultChannels(teamId, ruser, ""); err != nil { + l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err) } if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { |