From bda8fdc5f4da70e3d2bc032663a2188aa93d8c9c Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 18 Apr 2014 21:14:35 -0400
Subject: [PATCH] fix bug when logout without activate

---
 gogs.go | 2 +-
 web.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gogs.go b/gogs.go
index 84cf258929..65180754b5 100644
--- a/gogs.go
+++ b/gogs.go
@@ -19,7 +19,7 @@ import (
 // Test that go1.2 tag above is included in builds. main.go refers to this definition.
 const go12tag = true
 
-const APP_VER = "0.3.0.0416 Alpha"
+const APP_VER = "0.3.0.0418 Alpha"
 
 func init() {
 	base.AppVer = APP_VER
diff --git a/web.go b/web.go
index 58d0bc04cb..d8d5aba10d 100644
--- a/web.go
+++ b/web.go
@@ -92,7 +92,6 @@ func runWeb(*cli.Context) {
 		r.Post("/reset_password", user.ResetPasswdPost)
 	}, reqSignOut)
 	m.Group("/user", func(r martini.Router) {
-		r.Get("/logout", user.SignOut)
 		r.Get("/delete", user.Delete)
 		r.Post("/delete", user.DeletePost)
 		r.Get("/setting", user.Setting)
@@ -104,6 +103,7 @@ func runWeb(*cli.Context) {
 		r.Get("/email2user", user.Email2User)
 		r.Get("/forget_password", user.ForgotPasswd)
 		r.Post("/forget_password", user.ForgotPasswdPost)
+		r.Get("/logout", user.SignOut)
 	})
 	m.Group("/user/setting", func(r martini.Router) {
 		r.Get("/social", user.SettingSocial)