diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 16:01:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 16:01:06 -0400 |
| commit | 8c8d9dbf8fa3b4ebf640bf5e1a71f9c04b57e111 (patch) | |
| tree | 3de51f879e798045076e075c3fedf3cd73094415 /api4/channel.go | |
| parent | c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42 (diff) | |
| download | chat-8c8d9dbf8fa3b4ebf640bf5e1a71f9c04b57e111.tar.gz chat-8c8d9dbf8fa3b4ebf640bf5e1a71f9c04b57e111.tar.bz2 chat-8c8d9dbf8fa3b4ebf640bf5e1a71f9c04b57e111.zip | |
Forward port 3.8.1 changes that missed master (#6362)
Diffstat (limited to 'api4/channel.go')
| -rw-r--r-- | api4/channel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/channel.go b/api4/channel.go index 493b012a0..6daf43c74 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -259,7 +259,7 @@ func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - if groupChannel, err := app.CreateGroupChannel(userIds); err != nil { + if groupChannel, err := app.CreateGroupChannel(userIds, c.Session.UserId); err != nil { c.Err = err return } else { @@ -376,7 +376,7 @@ func getPublicChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Request return } - if channels, err := app.GetPublicChannelsForTeam(c.Params.TeamId, c.Params.Page, c.Params.PerPage); err != nil { + if channels, err := app.GetPublicChannelsForTeam(c.Params.TeamId, c.Params.Page*c.Params.PerPage, c.Params.PerPage); err != nil { c.Err = err return } else { |