diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-05 10:33:30 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-05 10:33:30 -0500 |
| commit | b8a1bd03cc58a355bbc28e9cecabbe6ed04f9115 (patch) | |
| tree | a4ac42d8032e92febbf2764341a2a32c1e5f6657 /api/team.go | |
| parent | 9ed37125e9be87fe88c6a1ee65b31bbb4de81c5a (diff) | |
| parent | c5cf1179e5bda6b99fd399a0aefcdfdd1daaadd9 (diff) | |
| download | chat-b8a1bd03cc58a355bbc28e9cecabbe6ed04f9115.tar.gz chat-b8a1bd03cc58a355bbc28e9cecabbe6ed04f9115.tar.bz2 chat-b8a1bd03cc58a355bbc28e9cecabbe6ed04f9115.zip | |
Merge pull request #1310 from mattermost/plt-697
PLT-697 Don't send welcome emails for users signing up from an email invite and update email content
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/api/team.go b/api/team.go index 7d746d922..862970887 100644 --- a/api/team.go +++ b/api/team.go @@ -510,16 +510,14 @@ func InviteMembers(c *Context, team *model.Team, user *model.User, invites []str } subjectPage := NewServerTemplatePage("invite_subject") - subjectPage.Props["SiteURL"] = c.GetSiteURL() subjectPage.Props["SenderName"] = sender subjectPage.Props["TeamDisplayName"] = team.DisplayName bodyPage := NewServerTemplatePage("invite_body") - bodyPage.Props["SiteURL"] = c.GetSiteURL() + bodyPage.Props["TeamURL"] = c.GetTeamURL() bodyPage.Props["TeamDisplayName"] = team.DisplayName bodyPage.Props["SenderName"] = sender bodyPage.Props["SenderStatus"] = senderRole - bodyPage.Props["Email"] = invite props := make(map[string]string) props["email"] = invite props["id"] = team.Id |