summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--model/channel_extra.go3
-rw-r--r--model/user.go3
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