From 878465b528dab56764a4e0a774a417fca870f6bc Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 20 Jun 2016 17:39:13 -0400 Subject: Only check team Id in getChannel for non-DMs (#3382) --- api/channel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/channel.go') diff --git a/api/channel.go b/api/channel.go index c4a5eae96..b4a5b78dc 100644 --- a/api/channel.go +++ b/api/channel.go @@ -784,7 +784,7 @@ func getChannel(c *Context, w http.ResponseWriter, r *http.Request) { member := cmresult.Data.(model.ChannelMember) data.Member = &member - if data.Channel.TeamId != c.TeamId { + if data.Channel.TeamId != c.TeamId && data.Channel.Type != model.CHANNEL_DIRECT { c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelId": id, "TeamId": c.TeamId}, "") return } -- cgit v1.2.3-1-g7c22