From 31415c8ddcc915c64c791ece2e2439883b7cf6ae Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 10 Jul 2015 16:52:32 -0400
Subject: Sanitize FirstName and LastName fields of an object instead of the
 nickname when ShowFullName is set to false

---
 model/channel_extra.go | 3 ---
 model/user.go          | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'model')

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
-- 
cgit v1.2.3-1-g7c22