github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl/partials: Remove superflous loop

Browse source 
No need to check the themes template prefix.
This commit is contained in:
Bjørn Erik Pedersen 2018-07-31 11:27:50 +02:00
parent f219ac09f6
commit 0afa2897a0
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
tpl/partials/partials.go
View file

@ -74,36 +74,35 @@ func (ns *Namespace) Include(name string, contextList ...interface{}) (interface
context = contextList[0] context = contextList[0]
} }
for _, n := range []string{"partials/" + name, "theme/partials/" + name} { n := "partials/" + name
templ, found := ns.deps.Tmpl.Lookup(n) templ, found := ns.deps.Tmpl.Lookup(n)
if !found { if !found {
// For legacy reasons. // For legacy reasons.
templ, found = ns.deps.Tmpl.Lookup(n + ".html") templ, found = ns.deps.Tmpl.Lookup(n + ".html")
}
if found {
b := bp.GetBuffer()
defer bp.PutBuffer(b)
if err := templ.Execute(b, context); err != nil {
return "", err
} }
if found {
b := bp.GetBuffer()
defer bp.PutBuffer(b)
if err := templ.Execute(b, context); err != nil {
return "", err
}
if _, ok := templ.(*texttemplate.Template); ok {
s := b.String()
if ns.deps.Metrics != nil {
ns.deps.Metrics.TrackValue(n, s)
}
return s, nil
}
if _, ok := templ.(*texttemplate.Template); ok {
s := b.String() s := b.String()
if ns.deps.Metrics != nil { if ns.deps.Metrics != nil {
ns.deps.Metrics.TrackValue(n, s) ns.deps.Metrics.TrackValue(n, s)
} }
return template.HTML(s), nil return s, nil
} }
s := b.String()
if ns.deps.Metrics != nil {
ns.deps.Metrics.TrackValue(n, s)
}
return template.HTML(s), nil
} }
return "", fmt.Errorf("Partial %q not found", name) return "", fmt.Errorf("Partial %q not found", name)