From 5e62ba8cccecb8603bb4aa6d2d4763b9ae205b65 Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Wed, 8 Nov 2023 18:18:33 +0100
Subject: [PATCH] Fix bad merge (#25371)

---
 server/channels/app/import_functions.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/channels/app/import_functions.go b/server/channels/app/import_functions.go
index a137d2d7aa..50e4ef8c95 100644
--- a/server/channels/app/import_functions.go
+++ b/server/channels/app/import_functions.go
@@ -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 {