From 8719c1b8c50cc68d734053d26d7b819e92783025 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 18 Apr 2014 12:12:10 -0400
Subject: [PATCH] Mirror bug fix
---
routers/user/user.go | 4 ++--
templates/user/{active.tmpl => activate.tmpl} | 0
web.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename templates/user/{active.tmpl => activate.tmpl} (100%)
diff --git a/routers/user/user.go b/routers/user/user.go
index 56b9dc205c..ce4d0cc3d0 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -341,7 +341,7 @@ func Activate(ctx *middleware.Context) {
} else {
ctx.Data["ServiceNotEnabled"] = true
}
- ctx.HTML(200, "user/active")
+ ctx.HTML(200, "user/activate")
return
}
@@ -363,7 +363,7 @@ func Activate(ctx *middleware.Context) {
}
ctx.Data["IsActivateFailed"] = true
- ctx.HTML(200, "user/active")
+ ctx.HTML(200, "user/activate")
}
func ForgotPasswd(ctx *middleware.Context) {
diff --git a/templates/user/active.tmpl b/templates/user/activate.tmpl
similarity index 100%
rename from templates/user/active.tmpl
rename to templates/user/activate.tmpl
diff --git a/web.go b/web.go
index 0be2a05a04..58d0bc04cb 100644
--- a/web.go
+++ b/web.go
@@ -100,7 +100,7 @@ func runWeb(*cli.Context) {
}, reqSignIn)
m.Group("/user", func(r martini.Router) {
r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds)
- r.Get("/activate", user.Activate)
+ r.Any("/activate", user.Activate)
r.Get("/email2user", user.Email2User)
r.Get("/forget_password", user.ForgotPasswd)
r.Post("/forget_password", user.ForgotPasswdPost)