Merge branch 'master' of github.com:gogits/gogs

1 files changed, 10 insertions, 3 deletions

diff --git a/routers/repo/single.go b/routers/repo/single.go
index d796d9639d..a7f07898f0 100644
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -10,12 +10,14 @@ import (
 )
 
 func Single(ctx *middleware.Context, params martini.Params) {
-	if !ctx.Data["IsRepositoryValid"].(bool) {
+	if !ctx.Repo.IsValid {
 		return
 	}
+
 	if params["branchname"] == "" {
 		params["branchname"] = "master"
 	}
+
 	treename := params["_1"]
 	files, err := models.GetReposFiles(params["username"], params["reponame"],
 		params["branchname"], treename)
@@ -45,11 +47,16 @@ func Single(ctx *middleware.Context, params martini.Params) {
 }
 
 func Setting(ctx *middleware.Context) {
-	if !ctx.Data["IsRepositoryValid"].(bool) {
+	if !ctx.Repo.IsValid {
 		return
 	}
 
-	ctx.Data["Title"] = ctx.Data["Title"].(string) + " - settings"
+	var title string
+	if t, ok := ctx.Data["Title"].(string); ok {
+		title = t
+	}
+
+	ctx.Data["Title"] = title + " - settings"
 	ctx.Data["IsRepoToolbarSetting"] = true
 	ctx.Render.HTML(200, "repo/setting", ctx.Data)
 }