test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Fix custom templates being ignored (#4638)

This commit is contained in:
Piotr Orzechowski 2018-08-08 13:15:48 +02:00 committed by Lauris BH
parent 00bd6277a8
commit 152c6af97e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/templates/static.go
View File

@ -112,13 +112,11 @@ func NewTemplateFileSystem() templateFileSystem {
return fs return fs
} }
var tplFileSys = NewTemplateFileSystem()
// HTMLRenderer implements the macaron handler for serving HTML templates. // HTMLRenderer implements the macaron handler for serving HTML templates.
func HTMLRenderer() macaron.Handler { func HTMLRenderer() macaron.Handler {
return macaron.Renderer(macaron.RenderOptions{ return macaron.Renderer(macaron.RenderOptions{
Funcs: NewFuncMap(), Funcs: NewFuncMap(),
TemplateFileSystem: tplFileSys, TemplateFileSystem: NewTemplateFileSystem(),
}) })
} }
@ -126,7 +124,7 @@ func HTMLRenderer() macaron.Handler {
func JSONRenderer() macaron.Handler { func JSONRenderer() macaron.Handler {
return macaron.Renderer(macaron.RenderOptions{ return macaron.Renderer(macaron.RenderOptions{
Funcs: NewFuncMap(), Funcs: NewFuncMap(),
TemplateFileSystem: tplFileSys, TemplateFileSystem: NewTemplateFileSystem(),
HTMLContentType: "application/json", HTMLContentType: "application/json",
}) })
} }