From 9330c943cd17152c5aca1619f6b87382e3800732 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 18 Nov 2015 23:52:09 -0500 Subject: work on #1891 --- routers/user/auth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'routers/user/auth.go') diff --git a/routers/user/auth.go b/routers/user/auth.go index 54cbf447..335ef522 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -40,8 +40,9 @@ func SignIn(ctx *middleware.Context) { if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl) ctx.Redirect(redirectTo) + } else { + ctx.Redirect(setting.AppSubUrl + "/") } - ctx.Redirect(setting.AppSubUrl + "/") return } -- cgit v1.2.3 From dc0c0dc06ba6569c379ed98e16f7407b15173af1 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 19 Nov 2015 11:52:39 -0500 Subject: fix typo for #1996 --- routers/user/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routers/user/auth.go') diff --git a/routers/user/auth.go b/routers/user/auth.go index 335ef522..24ed3673 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -254,7 +254,7 @@ func ActivateEmail(ctx *middleware.Context) { } log.Trace("Email activated: %s", email.Email) - ctx.Flash.Success(ctx.Tr("settings.add_email_successs")) + ctx.Flash.Success(ctx.Tr("settings.add_email_success")) } ctx.Redirect(setting.AppSubUrl + "/user/settings/email") -- cgit v1.2.3