upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix bad merge (#25371)

Browse source
This commit is contained in:
Ben Schumacher 2023-11-08 18:18:33 +01:00 committed by GitHub
parent 808c6ec6dc
commit 5e62ba8ccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/channels/app/import_functions.go
View file

@ -591,7 +591,7 @@ func (a *App) importUser(rctx request.CTX, data *imports.UserImportData, dryRun
}
}
if password != "" {
if appErr = a.UpdatePassword(c, user, password); appErr != nil {
if appErr = a.UpdatePassword(rctx, user, password); appErr != nil {
return appErr
}
} else {