diff options
| author | zeripath <art27@cantab.net> | 2022-03-18 09:57:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 17:57:07 +0800 |
| commit | 7fc5fd6415f92120811747681bcde9ed42825151 (patch) | |
| tree | bf68cbb2499547c6575d02fe397484d0e4da2c8f /templates | |
| parent | 929b07fe45dcf7622fb47be3f7251ea37483f323 (diff) | |
| download | gitea-7fc5fd6415f92120811747681bcde9ed42825151.tar.gz gitea-7fc5fd6415f92120811747681bcde9ed42825151.zip | |
Do not send activation email if manual confirm is set (#19119)
If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because `handleUserCreated` is not checking for this case.
Fix #17263
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/user/auth/activate.tmpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 8d75c1d92e..65dfd6b6a6 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -32,6 +32,8 @@ <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" (.Email|Escape) .ActiveCodeLives | Str2html}}</p> {{else if .IsActivateFailed}} <p>{{.i18n.Tr "auth.invalid_code"}}</p> + {{else if .ManualActivationOnly}} + <p class="center">{{.i18n.Tr "auth.manual_activation_only"}}</p> {{else}} <p>{{.i18n.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}</p> <div class="ui divider"></div> |