summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
Diffstat (limited to 'model')
-rw-r--r--model/user.go2
-rw-r--r--model/user_test.go3
2 files changed, 4 insertions, 1 deletions
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) {