diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /api4/channel.go | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'api4/channel.go')
| -rw-r--r-- | api4/channel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/channel.go b/api4/channel.go index 5ed63320b..bd1710975 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -131,7 +131,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } else { if oldChannelDisplayName != channel.DisplayName { - if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.Params.TeamId, oldChannelDisplayName, channel.DisplayName); err != nil { + if err := app.PostUpdateChannelDisplayNameMessage(c.Session.UserId, channel.Id, c.Params.TeamId, oldChannelDisplayName, channel.DisplayName, c.GetSiteURL()); err != nil { l4g.Error(err.Error()) } } @@ -302,7 +302,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - err = app.DeleteChannel(channel, c.Session.UserId) + err = app.DeleteChannel(channel, c.Session.UserId, c.GetSiteURL()) if err != nil { c.Err = err return @@ -521,7 +521,7 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err = app.RemoveUserFromChannel(c.Params.UserId, c.Session.UserId, channel); err != nil { + if err = app.RemoveUserFromChannel(c.Params.UserId, c.Session.UserId, channel, c.GetSiteURL()); err != nil { c.Err = err return } |