diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-01-11 06:54:55 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-01-11 06:54:55 -0500 |
commit | 7aa7f83524c06b6e0a9ec2274d4ac4744a83bda8 (patch) | |
tree | 55ae148c4336125f76f4aa9ba4731c94d9297811 /model/channel.go | |
parent | 2d141c29826f31aacad286b63cca61a551c619a8 (diff) | |
parent | d7230e8753c848725ba5b61d11b29b6280fce94b (diff) | |
download | chat-7aa7f83524c06b6e0a9ec2274d4ac4744a83bda8.tar.gz chat-7aa7f83524c06b6e0a9ec2274d4ac4744a83bda8.tar.bz2 chat-7aa7f83524c06b6e0a9ec2274d4ac4744a83bda8.zip |
Merge pull request #1824 from hmhealey/plt1525
PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
Diffstat (limited to 'model/channel.go')
-rw-r--r-- | model/channel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/channel.go b/model/channel.go index 0ce09f4bc..7109500d4 100644 --- a/model/channel.go +++ b/model/channel.go @@ -57,8 +57,8 @@ func (o *Channel) Etag() string { return Etag(o.Id, o.UpdateAt) } -func (o *Channel) ExtraEtag() string { - return Etag(o.Id, o.ExtraUpdateAt) +func (o *Channel) ExtraEtag(memberLimit int) string { + return Etag(o.Id, o.ExtraUpdateAt, memberLimit) } func (o *Channel) IsValid() *AppError { |