summaryrefslogtreecommitdiffstats
path: root/model/client.go
diff options
context:
space:
mode:
Diffstat (limited to 'model/client.go')
-rw-r--r--model/client.go9
1 files changed, 1 insertions, 8 deletions
diff --git a/model/client.go b/model/client.go
index a74adcd7a..f045401eb 100644
--- a/model/client.go
+++ b/model/client.go
@@ -997,15 +997,8 @@ func (c *Client) GetPublicLink(filename string) (*Result, *AppError) {
if r, err := c.DoApiPost(c.GetTeamRoute()+"/files/get_public_link", MapToJson(map[string]string{"filename": filename})); err != nil {
return nil, err
} else {
- var link string
- if body, err := ioutil.ReadAll(r.Body); err == nil {
- link = string(body)
- } else {
- // all the other Client methods return an empty string on invalid json, so we can too
- }
-
return &Result{r.Header.Get(HEADER_REQUEST_ID),
- r.Header.Get(HEADER_ETAG_SERVER), link}, nil
+ r.Header.Get(HEADER_ETAG_SERVER), StringFromJson(r.Body)}, nil
}
}