summaryrefslogtreecommitdiffstats
path: root/web/web.go
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-07-09 13:59:19 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-07-17 15:13:24 -0400
commitc09f1b9e4e5638080622ff9aa70735db382a16df (patch)
treea05d7d71d87cf436c30424a2f34e0cb0db9aaff1 /web/web.go
parent1d7509493e65324d1e81bf39c51a9d7c07335c56 (diff)
downloadchat-c09f1b9e4e5638080622ff9aa70735db382a16df.tar.gz
chat-c09f1b9e4e5638080622ff9aa70735db382a16df.tar.bz2
chat-c09f1b9e4e5638080622ff9aa70735db382a16df.zip
Renamed FullName column in database to Nickname. Renamed all serverside references from FullName to Nickname.
Diffstat (limited to 'web/web.go')
-rw-r--r--web/web.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/web.go b/web/web.go
index e771157d8..caa779ec9 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, strings.Split(user.Nickname, " ")[0], user.Email, domain, c.TeamUrl)
http.Redirect(w, r, "/", http.StatusFound)
return
}