Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 2 insertions, 4 deletions

diff --git a/routers/dev/template.go b/routers/dev/template.go
index da477c94..e4f2429a 100644
--- a/routers/dev/template.go
+++ b/routers/dev/template.go
@@ -5,15 +5,13 @@
 package dev
 
 import (
-	"github.com/go-martini/martini"
-
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
 	"github.com/gogits/gogs/modules/setting"
 )
 
-func TemplatePreview(ctx *middleware.Context, params martini.Params) {
+func TemplatePreview(ctx *middleware.Context) {
 	ctx.Data["User"] = models.User{Name: "Unknown"}
 	ctx.Data["AppName"] = setting.AppName
 	ctx.Data["AppVer"] = setting.AppVer
@@ -23,5 +21,5 @@ func TemplatePreview(ctx *middleware.Context, params martini.Params) {
 	ctx.Data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60
 	ctx.Data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60
 	ctx.Data["CurDbValue"] = ""
-	ctx.HTML(200, base.TplName(params["_1"]))
+	ctx.HTML(200, base.TplName(ctx.Params("*")))
 }