summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-10-28 08:55:17 -0400
committerChristopher Speller <crspeller@gmail.com>2016-10-28 08:55:17 -0400
commit35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6 (patch)
tree058eab059da91b49c4a805fe8f87ba08b74bbcc2 /store
parent589329b5c5e486fa32b77fd0afb525d446ea1e6d (diff)
downloadchat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.tar.gz
chat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.tar.bz2
chat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.zip
Fix members being loaded before channel members and DM headers (#4369)
Diffstat (limited to 'store')
-rw-r--r--store/sql_channel_store.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index f1cf7f849..d1d48ef69 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -1039,7 +1039,7 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) StoreCh
FROM ChannelMembers cm
INNER JOIN Channels c
ON c.Id = cm.ChannelId
- AND c.TeamId = :TeamId
+ AND (c.TeamId = :TeamId OR c.TeamId = '')
WHERE cm.UserId = :UserId
`, map[string]interface{}{"TeamId": teamId, "UserId": userId})