Skip to content

Commit 815fa0e

Browse files
6543lafriks
authored and
zhaoxin
committed
Fix external renderer (go-gitea#16401)
* fix external renderer * use GBackground context as fallback * no fallback, return error Co-authored-by: Lauris BH <[email protected]>
1 parent 370d1d1 commit 815fa0e

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

modules/markup/external/external.go

+4
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ func (p *Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.
9898
args = append(args, f.Name())
9999
}
100100

101+
if ctx == nil || ctx.Ctx == nil {
102+
return fmt.Errorf("RenderContext did not provide context")
103+
}
104+
101105
processCtx, cancel := context.WithCancel(ctx.Ctx)
102106
defer cancel()
103107

routers/web/repo/view.go

+3
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
336336
ctx.Data["MarkupType"] = string(markupType)
337337
var result strings.Builder
338338
err := markup.Render(&markup.RenderContext{
339+
Ctx: ctx,
339340
Filename: readmeFile.name,
340341
URLPrefix: readmeTreelink,
341342
Metas: ctx.Repo.Repository.ComposeDocumentMetas(),
@@ -511,6 +512,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
511512
ctx.Data["MarkupType"] = markupType
512513
var result strings.Builder
513514
err := markup.Render(&markup.RenderContext{
515+
Ctx: ctx,
514516
Filename: blob.Name(),
515517
URLPrefix: path.Dir(treeLink),
516518
Metas: ctx.Repo.Repository.ComposeDocumentMetas(),
@@ -570,6 +572,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
570572
ctx.Data["MarkupType"] = markupType
571573
var result strings.Builder
572574
err := markup.Render(&markup.RenderContext{
575+
Ctx: ctx,
573576
Filename: blob.Name(),
574577
URLPrefix: path.Dir(treeLink),
575578
Metas: ctx.Repo.Repository.ComposeDocumentMetas(),

0 commit comments

Comments
 (0)