From 1cfb35fd32478917ddf8becb7e438280db19d66a Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 15 Jun 2016 08:00:55 -0400
Subject: Fix channels showing up across teams when multiple teams open in same
 browser (#3329)

---
 api/channel.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'api/channel.go')

diff --git a/api/channel.go b/api/channel.go
index e0428f311..c4a5eae96 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -784,6 +784,11 @@ func getChannel(c *Context, w http.ResponseWriter, r *http.Request) {
 		member := cmresult.Data.(model.ChannelMember)
 		data.Member = &member
 
+		if data.Channel.TeamId != c.TeamId {
+			c.Err = model.NewLocAppError("getChannel", "api.channel.get_channel.wrong_team.app_error", map[string]interface{}{"ChannelId": id, "TeamId": c.TeamId}, "")
+			return
+		}
+
 		if HandleEtag(data.Etag(), w, r) {
 			return
 		} else {
-- 
cgit v1.2.3-1-g7c22