diff options
| author | Unknwon <u@gogs.io> | 2015-09-17 01:54:12 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-17 01:54:12 -0400 |
| commit | 373731f5e85566eb385e92f604e81232e3d6ba1a (patch) | |
| tree | 83311e464adf24f3006030e27473086e43a11240 /routers/user/auth.go | |
| parent | e75fd2f783a413ae612e3e6110c912b3ecf9555d (diff) | |
| download | gitea-373731f5e85566eb385e92f604e81232e3d6ba1a.tar.gz gitea-373731f5e85566eb385e92f604e81232e3d6ba1a.zip | |
user gomail and new activate account email tpl
- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header
Diffstat (limited to 'routers/user/auth.go')
| -rw-r--r-- | routers/user/auth.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 6694e7e8f3..fa48612737 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -249,7 +249,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe // Send confirmation e-mail, no need for social account. if !isOauth && setting.Service.RegisterEmailConfirm && u.Id > 1 { - mailer.SendRegisterMail(ctx.Render, u) + mailer.SendActivateAccountMail(ctx.Context, u) ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 @@ -278,7 +278,7 @@ func Activate(ctx *middleware.Context) { ctx.Data["ResendLimited"] = true } else { ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 - mailer.SendActiveMail(ctx.Render, ctx.User) + mailer.SendActivateAccountMail(ctx.Context, ctx.User) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) |