fix email with + when active (#17518) (#17520)

lunny · zeripath · web-flow · commit f572fb906f3c · 2021-11-03T00:52:38.000+02:00
Co-authored-by: zeripath &lt;art27@cantab.net&gt;
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -390,6 +390,7 @@ func NewFuncMap() []template.FuncMap {
 			html += "</span>"
 			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
@@ -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
`@@ -390,6 +390,7 @@ func NewFuncMap() []template.FuncMap {`
`390`	`390`	`html += "</span>"`
`391`	`391`	`return template.HTML(html)`
`392`	`392`	`},`
	`393`	`+ "QueryEscape": url.QueryEscape,`
`393`	`394`	`}}`
`394`	`395`	`}`
`395`	`396`
`@@ -510,6 +511,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {`
`510`	`511`	`}`
`511`	`512`	`return sum`
`512`	`513`	`},`
	`514`	`+ "QueryEscape": url.QueryEscape,`
`513`	`515`	`}}`
`514`	`516`	`}`
`515`	`517`