mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-25 01:52:23 +00:00
tpl: Factor out double Lookup in executeTemplate
This commit is contained in:
parent
474eb454df
commit
8ddd95e361
1 changed files with 8 additions and 10 deletions
|
@ -117,19 +117,17 @@ func partial(name string, contextList ...interface{}) template.HTML {
|
|||
}
|
||||
|
||||
func executeTemplate(context interface{}, w io.Writer, layouts ...string) {
|
||||
worked := false
|
||||
var worked bool
|
||||
for _, layout := range layouts {
|
||||
|
||||
name := layout
|
||||
|
||||
if Lookup(name) == nil {
|
||||
name = layout + ".html"
|
||||
templ := Lookup(layout)
|
||||
if templ == nil {
|
||||
layout += ".html"
|
||||
templ = Lookup(layout)
|
||||
}
|
||||
|
||||
if templ := Lookup(name); templ != nil {
|
||||
err := templ.Execute(w, context)
|
||||
if err != nil {
|
||||
jww.ERROR.Println(err, "in", name)
|
||||
if templ != nil {
|
||||
if err := templ.Execute(w, context); err != nil {
|
||||
jww.ERROR.Println(err, "in", layout)
|
||||
}
|
||||
worked = true
|
||||
break
|
||||
|
|
Loading…
Reference in a new issue