From ca90fe5cbe43df68a2690077b86377f5823f3284 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 13 Mar 2017 13:20:21 -0400 Subject: Fix permalink in email for DMs/GMs (#5751) --- app/notification.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/notification.go') diff --git a/app/notification.go b/app/notification.go index 67959c6bc..7b61de9ac 100644 --- a/app/notification.go +++ b/app/notification.go @@ -318,8 +318,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe } func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User, siteURL string) *model.AppError { - if channel.IsGroupOrDirect() && channel.TeamId != team.Id { - // this message is a cross-team DM/GM so we need to find a team that the recipient is on to use in the link + if channel.IsGroupOrDirect() { if result := <-Srv.Store.Team().GetTeamsByUserId(user.Id); result.Err != nil { return result.Err } else { -- cgit v1.2.3-1-g7c22