From 0affad9c247303d2e6c23bf45e3b5a33332f0aee Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Thu, 29 Mar 2018 14:58:18 -0400 Subject: fix user timezone initialization (#8547) On PreSave, need to ensure TimeZone isn't left as NULL. --- model/user.go | 2 +- model/user_test.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'model') diff --git a/model/user.go b/model/user.go index c3a6ec04a..066ea5fd2 100644 --- a/model/user.go +++ b/model/user.go @@ -211,7 +211,7 @@ func (u *User) PreSave() { } if u.Timezone == nil { - u.Props = make(map[string]string) + u.Timezone = make(map[string]string) } if len(u.Password) > 0 { diff --git a/model/user_test.go b/model/user_test.go index 72ad6a92b..4ef59f748 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -36,6 +36,9 @@ func TestUserPreSave(t *testing.T) { user := User{Password: "test"} user.PreSave() user.Etag(true, true) + if user.Timezone == nil { + t.Fatal("Timezone is nil") + } } func TestUserPreUpdate(t *testing.T) { -- cgit v1.2.3-1-g7c22