diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-11 21:47:43 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-11 21:47:43 -0400 |
| commit | 4fc5dcc7648c9e01e05f9dbf08e930ba325839d9 (patch) | |
| tree | 34bc4d3cc3ce0edf0ee139605c966d0199d14eb3 /routers/user/user.go | |
| parent | 33aa4f74380ab117673a1cc30bead3a7f2b3cb4b (diff) | |
| parent | f8e97b75fbe7201830413fabead33967fb690827 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'routers/user/user.go')
| -rw-r--r-- | routers/user/user.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/user/user.go b/routers/user/user.go index 253ab7be..8585267a 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -82,7 +82,6 @@ func SignIn(ctx *middleware.Context) { ctx.Data["OauthGitHubEnabled"] = base.OauthService.GitHub.Enabled } - var user *models.User // Check auto-login. userName := ctx.GetCookie(base.CookieUserName) if len(userName) == 0 { @@ -91,7 +90,6 @@ func SignIn(ctx *middleware.Context) { } isSucceed := false - var err error defer func() { if !isSucceed { log.Trace("%s auto-login cookie cleared: %s", ctx.Req.RequestURI, userName) @@ -101,7 +99,7 @@ func SignIn(ctx *middleware.Context) { } }() - user, err = models.GetUserByName(userName) + user, err := models.GetUserByName(userName) if err != nil { ctx.HTML(500, "user/signin") return @@ -181,6 +179,8 @@ func SignOut(ctx *middleware.Context) { ctx.Session.Delete("userId") ctx.Session.Delete("userName") ctx.Session.Delete("socialId") + ctx.Session.Delete("socialName") + ctx.Session.Delete("socialEmail") ctx.SetCookie(base.CookieUserName, "", -1) ctx.SetCookie(base.CookieRememberName, "", -1) ctx.Redirect("/") |