From 5be99e1f85fff344485b6750be43a3506d8f8341 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 10 Jan 2017 16:17:08 -0500 Subject: Fixing DM channel emails (#5038) --- api/post.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/api/post.go b/api/post.go index 45ead08e0..8b5a33224 100644 --- a/api/post.go +++ b/api/post.go @@ -905,15 +905,18 @@ func sendNotificationEmail(c *Context, post *model.Post, user *model.User, chann for i := range teams { if teams[i].Id == team.Id { found = true + team = teams[i] break } } - if !found && len(teams) > 0 { - team = teams[0] - } else { - // in case the user hasn't joined any teams we send them to the select_team page - team = &model.Team{Name: "select_team", DisplayName: utils.Cfg.TeamSettings.SiteName} + if !found { + if len(teams) > 0 { + team = teams[0] + } else { + // in case the user hasn't joined any teams we send them to the select_team page + team = &model.Team{Name: "select_team", DisplayName: utils.Cfg.TeamSettings.SiteName} + } } } } -- cgit v1.2.3-1-g7c22