diff options
author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /model/preference.go | |
parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'model/preference.go')
-rw-r--r-- | model/preference.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/model/preference.go b/model/preference.go index 5d462de8b..dc97314c5 100644 --- a/model/preference.go +++ b/model/preference.go @@ -47,23 +47,14 @@ type Preference struct { } func (o *Preference) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func PreferenceFromJson(data io.Reader) *Preference { - decoder := json.NewDecoder(data) - var o Preference - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Preference + json.NewDecoder(data).Decode(&o) + return o } func (o *Preference) IsValid() *AppError { |