From 5bb0c92b6cb09945d9324dbaf286d2b1fb65dd58 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 19 Mar 2022 14:20:42 +0000 Subject: Do not send activation email if manual confirm is set (#19119) (#19122) Backport #19119 If the mailer is configured then even if Manual confirm is set an activation email is still being sent because `handleUserCreated` is not checking for this case. Fix #17263 Signed-off-by: Andrew Thornton --- routers/web/auth/auth.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'routers/web') diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 206a0b7261..e0a2776926 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -621,6 +621,12 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth. // Send confirmation email if !u.IsActive && u.ID > 1 { + if setting.Service.RegisterManualConfirm { + ctx.Data["ManualActivationOnly"] = true + ctx.HTML(http.StatusOK, TplActivate) + return + } + mailer.SendActivateAccountMail(ctx.Locale, u) ctx.Data["IsSendRegisterMail"] = true -- cgit v1.2.3