fix email with + when active (#17518)

lunny · zeripath · web-flow · commit e69521f0292a · 2021-11-02T06:26:13.000Z
Co-authored-by: zeripath &lt;art27@cantab.net&gt;
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -498,6 +498,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
@@ -5,7 +5,7 @@
 	<title>{{.i18n.Tr "mail.activate_email.title" .DisplayName}}</title>
 </head>
 
-{{ $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)}}
 <body>
 	<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
 	<p>{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>

Original file line number	Diff line number	Diff line change
`@@ -498,6 +498,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {`
`498`	`498`	`}`
`499`	`499`	`return sum`
`500`	`500`	`},`
	`501`	`+ "QueryEscape": url.QueryEscape,`
`501`	`502`	`}}`
`502`	`503`	`}`
`503`	`504`