diff options
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 { |