From 530f6c1da4fb1ead06e70300ccab07eb133551e8 Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Thu, 13 Oct 2016 20:17:06 +0200 Subject: [PATCH] Fix rendering of non-markdown readme files --- routers/repo/view.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routers/repo/view.go b/routers/repo/view.go index ef180b773..499cf2d47 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -88,6 +88,9 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["IsMarkdown"] = true buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas()) default: + // FIXME This is the only way to show non-markdown files + // instead of a broken "View Raw" link + ctx.Data["IsMarkdown"] = true buf = bytes.Replace(buf, []byte("\n"), []byte(`
`), -1) } ctx.Data["FileContent"] = string(buf) @@ -156,8 +159,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name()) ctx.Data["ReadmeExist"] = readmeExist - if readmeExist { - // TODO: don't need to render if it's a README but not Markdown file. + if readmeExist && 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.