mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Prevent template renderer from rendering error (#14646) 

When there is a panic during template rendering unrolled/render
will automatically render the error. This leads to the
panic being displayed in the page and not a 500 page

Fix #14467
Fix #14525

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-02-13 19:41:53 +00:00 committed by GitHub
parent b3c2e23cbb
commit c9f1baf620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/templates/base.go
View File

@ -86,11 +86,12 @@ func getDirAssetNames(dir string) []string {
// HTMLRenderer returns a render. // HTMLRenderer returns a render.
func HTMLRenderer() *render.Render { func HTMLRenderer() *render.Render {
return render.New(render.Options{ return render.New(render.Options{
Extensions: []string{".tmpl"}, Extensions: []string{".tmpl"},
Directory: "templates", Directory: "templates",
Funcs: NewFuncMap(), Funcs: NewFuncMap(),
Asset: GetAsset, Asset: GetAsset,
AssetNames: GetAssetNames, AssetNames: GetAssetNames,
IsDevelopment: !setting.IsProd(), IsDevelopment: !setting.IsProd(),
DisableHTTPErrorRendering: true,
}) })
} }