mirror of https://github.com/go-gitea/gitea.git
Fix custom templates being ignored (#4638)
parent
00bd6277a8
commit
152c6af97e
|
@ -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",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue