summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-07-13 08:12:11 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-07-13 08:12:11 -0400
commit4eed88e0c2eebbaf04489526dfaeab7cfb77ee98 (patch)
tree2e1ba735fc9cf00cedb70d361177efcfd01d7333 /api
parent9a654d7b274422789e5d73898244964db7083e9d (diff)
downloadchat-4eed88e0c2eebbaf04489526dfaeab7cfb77ee98.tar.gz
chat-4eed88e0c2eebbaf04489526dfaeab7cfb77ee98.tar.bz2
chat-4eed88e0c2eebbaf04489526dfaeab7cfb77ee98.zip
PLT-7092 Fixed creation of PostList with null Posts fields (#6924)
Diffstat (limited to 'api')
-rw-r--r--api/channel.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/api/channel.go b/api/channel.go
index c7b0630e6..2a56e7c93 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -602,16 +602,15 @@ func getMyChannelMembers(c *Context, w http.ResponseWriter, r *http.Request) {
func getPinnedPosts(c *Context, w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
channelId := params["channel_id"]
- posts := &model.PostList{}
if result := <-app.Srv.Store.Channel().GetPinnedPosts(channelId); result.Err != nil {
c.Err = result.Err
return
} else {
- posts = result.Data.(*model.PostList)
+ posts := result.Data.(*model.PostList)
+ w.Write([]byte(posts.ToJson()))
}
- w.Write([]byte(posts.ToJson()))
}
func addMember(c *Context, w http.ResponseWriter, r *http.Request) {