From 1a9953348cbb8e8205dc1f923d17b3e40e9f64e0 Mon Sep 17 00:00:00 2001 From: Jack Hay Date: Thu, 7 Sep 2023 10:50:45 -0400 Subject: [PATCH] Team invite url fix when registration disabled (#26950) This is a follow-on to https://github.com/go-gitea/gitea/pull/26550 and fixes the case where the team invite links to the registration page if it is disabled in settings. --- services/mailer/mail_team_invite.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index 1403923c7..88ad0c983 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -46,8 +46,8 @@ func MailTeamInvite(ctx context.Context, inviter *user_model.User, team *org_mod inviteRedirect := url.QueryEscape(fmt.Sprintf("/org/invite/%s", invite.Token)) inviteURL := fmt.Sprintf("%suser/sign_up?redirect_to=%s", setting.AppURL, inviteRedirect) - if err == nil && user != nil { - // user account exists + if (err == nil && user != nil) || setting.Service.DisableRegistration || setting.Service.AllowOnlyExternalRegistration { + // user account exists or registration disabled inviteURL = fmt.Sprintf("%suser/login?redirect_to=%s", setting.AppURL, inviteRedirect) }