diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-07-10 16:52:32 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-07-17 15:22:56 -0400 |
| commit | 31415c8ddcc915c64c791ece2e2439883b7cf6ae (patch) | |
| tree | 6d7338f3fb06c281173fe0ac146bc4930ca2f393 /model | |
| parent | b620960cdefe87d9e96958ab526c294ee6502a90 (diff) | |
| download | chat-31415c8ddcc915c64c791ece2e2439883b7cf6ae.tar.gz chat-31415c8ddcc915c64c791ece2e2439883b7cf6ae.tar.bz2 chat-31415c8ddcc915c64c791ece2e2439883b7cf6ae.zip | |
Sanitize FirstName and LastName fields of an object instead of the nickname when ShowFullName is set to false
Diffstat (limited to 'model')
| -rw-r--r-- | model/channel_extra.go | 3 | ||||
| -rw-r--r-- | model/user.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/model/channel_extra.go b/model/channel_extra.go index d1579f905..3a918b524 100644 --- a/model/channel_extra.go +++ b/model/channel_extra.go @@ -20,9 +20,6 @@ func (o *ExtraMember) Sanitize(options map[string]bool) { if len(options) == 0 || !options["email"] { o.Email = "" } - if len(options) == 0 || !options["fullname"] { - o.Nickname = "" - } } type ChannelExtra struct { diff --git a/model/user.go b/model/user.go index 7265381fd..5422f68a5 100644 --- a/model/user.go +++ b/model/user.go @@ -201,7 +201,8 @@ func (u *User) Sanitize(options map[string]bool) { u.Email = "" } if len(options) != 0 && !options["fullname"] { - u.Nickname = "" + u.FirstName = "" + u.LastName = "" } if len(options) != 0 && !options["skypeid"] { // TODO - fill in when SkypeId is added to user model |