From f572fb906f3ca019683f3d33dc5c4d58a832af65 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 3 Nov 2021 06:52:38 +0800 Subject: [PATCH] fix email with + when active (#17518) (#17520) Co-authored-by: zeripath --- modules/templates/helper.go | 2 ++ templates/mail/auth/activate_email.tmpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index fcddb59d65..29d83c198f 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -390,6 +390,7 @@ func NewFuncMap() []template.FuncMap { html += "" return template.HTML(html) }, + "QueryEscape": url.QueryEscape, }} } @@ -510,6 +511,7 @@ func NewTextFuncMap() []texttmpl.FuncMap { } return sum }, + "QueryEscape": url.QueryEscape, }} } diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 6a8de50112..a1d7ec37ec 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -5,7 +5,7 @@ {{.i18n.Tr "mail.activate_email.title" .DisplayName}} -{{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl .Code .Email}} +{{ $activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl .Code (QueryEscape .Email)}}

{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}


{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}

{{$activate_url}}