Merge pull request #177 from hmhealey/mm825

MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname

1 files changed, 3 insertions, 3 deletions

diff --git a/web/web.go b/web/web.go
index e771157d8..b11e6e6b1 100644
--- a/web/web.go
+++ b/web/web.go
@@ -303,8 +303,8 @@ func getChannel(c *api.Context, w http.ResponseWriter, r *http.Request) {
 
 			//api.Handle404(w, r)
 			//Bad channel urls just redirect to the town-square for now
-			
-			http.Redirect(w,r,"/channels/town-square", http.StatusFound)
+
+			http.Redirect(w, r, "/channels/town-square", http.StatusFound)
 			return
 		}
 	}
@@ -351,7 +351,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
 			return
 		} else {
 			user := result.Data.(*model.User)
-			api.FireAndForgetVerifyEmail(user.Id, strings.Split(user.FullName, " ")[0], user.Email, domain, c.TeamUrl)
+			api.FireAndForgetVerifyEmail(user.Id, user.FirstName, user.Email, domain, c.TeamUrl)
 			http.Redirect(w, r, "/", http.StatusFound)
 			return
 		}