mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	fix email with + when active (#17518)
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
		@@ -498,6 +498,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			return sum
 | 
								return sum
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
 | 
							"QueryEscape": url.QueryEscape,
 | 
				
			||||||
	}}
 | 
						}}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@
 | 
				
			|||||||
	<title>{{.i18n.Tr "mail.activate_email.title" .DisplayName}}</title>
 | 
						<title>{{.i18n.Tr "mail.activate_email.title" .DisplayName}}</title>
 | 
				
			||||||
</head>
 | 
					</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>
 | 
					<body>
 | 
				
			||||||
	<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
 | 
						<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>
 | 
						<p>{{.i18n.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}</p><p><a href="{{$activate_url}}">{{$activate_url}}</a></p><br>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user