From a2f2f7717ac7bcc887da3771adfefe67c346c512 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 27 Jan 2017 16:52:19 -0500 Subject: [PATCH] Fix template error when rendering non-README markdown (#4063) --- README.md | 2 +- gogs.go | 2 +- routers/repo/view.go | 5 ++--- templates/.VERSION | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 34bd0bf44..dcae1f1a0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.119 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions ~~or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)~~) +##### Current tip version: 0.9.120 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions ~~or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)~~) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index b85b3e558..1bc230d19 100644 --- a/gogs.go +++ b/gogs.go @@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.119.0126" +const APP_VER = "0.9.120.0127" func init() { setting.AppVer = APP_VER diff --git a/routers/repo/view.go b/routers/repo/view.go index 5fc38fb20..c6bf4b900 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -154,10 +154,9 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st isMarkdown := markdown.IsMarkdownFile(blob.Name()) ctx.Data["IsMarkdown"] = isMarkdown + ctx.Data["ReadmeExist"] = isMarkdown && markdown.IsReadmeFile(blob.Name()) - readmeExist := isMarkdown && markdown.IsReadmeFile(blob.Name()) - ctx.Data["ReadmeExist"] = readmeExist - if readmeExist { + if isMarkdown { ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas())) } else { // Building code view blocks with line number on server side. diff --git a/templates/.VERSION b/templates/.VERSION index b07020d9f..67aeeccbd 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.119.0126 \ No newline at end of file +0.9.120.0127 \ No newline at end of file