summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-01-16 18:33:25 -0500
committerCorey Hulen <corey@hulen.com>2017-01-16 18:33:25 -0500
commit4386432834436aa34863e640b9c1850448a9e9aa (patch)
tree37f19f04aac46ca3292a6a0e73602349750a61bb /api
parent6b2c4a346ba9c50d533eadb2c64086d67d32c565 (diff)
downloadchat-4386432834436aa34863e640b9c1850448a9e9aa.tar.gz
chat-4386432834436aa34863e640b9c1850448a9e9aa.tar.bz2
chat-4386432834436aa34863e640b9c1850448a9e9aa.zip
Fix preferences not loading correctly (#5084)
Diffstat (limited to 'api')
-rw-r--r--api/user.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go
index 701badfc9..7587b83ad 100644
--- a/api/user.go
+++ b/api/user.go
@@ -633,7 +633,11 @@ func getInitialLoad(c *Context, w http.ResponseWriter, r *http.Request) {
}
il.User.Sanitize(map[string]bool{})
- il.Preferences, err = app.GetPreferencesForUser(c.Session.Id)
+ il.Preferences, err = app.GetPreferencesForUser(c.Session.UserId)
+ if err != nil {
+ c.Err = err
+ return
+ }
il.Teams, err = app.GetTeamsForUser(c.Session.UserId)
if err != nil {