mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
Return early from appendThemeTemplates
This commit is contained in:
parent
c50c66879d
commit
3529152efe
1 changed files with 26 additions and 24 deletions
|
@ -1448,31 +1448,33 @@ func errorCollator(results <-chan error, errs chan<- error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Site) appendThemeTemplates(in []string) []string {
|
func (s *Site) appendThemeTemplates(in []string) []string {
|
||||||
if s.hasTheme() {
|
if !s.hasTheme() {
|
||||||
out := []string{}
|
return in
|
||||||
// First place all non internal templates
|
|
||||||
for _, t := range in {
|
|
||||||
if !strings.HasPrefix(t, "_internal/") {
|
|
||||||
out = append(out, t)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Then place theme templates with the same names
|
|
||||||
for _, t := range in {
|
|
||||||
if !strings.HasPrefix(t, "_internal/") {
|
|
||||||
out = append(out, "theme/"+t)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lastly place internal templates
|
|
||||||
for _, t := range in {
|
|
||||||
if strings.HasPrefix(t, "_internal/") {
|
|
||||||
out = append(out, t)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
}
|
||||||
return in
|
|
||||||
|
out := []string{}
|
||||||
|
// First place all non internal templates
|
||||||
|
for _, t := range in {
|
||||||
|
if !strings.HasPrefix(t, "_internal/") {
|
||||||
|
out = append(out, t)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Then place theme templates with the same names
|
||||||
|
for _, t := range in {
|
||||||
|
if !strings.HasPrefix(t, "_internal/") {
|
||||||
|
out = append(out, "theme/"+t)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lastly place internal templates
|
||||||
|
for _, t := range in {
|
||||||
|
if strings.HasPrefix(t, "_internal/") {
|
||||||
|
out = append(out, t)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type taxRenderInfo struct {
|
type taxRenderInfo struct {
|
||||||
|
|
Loading…
Reference in a new issue