From: Bjørn Erik Pedersen Date: Thu, 17 Mar 2016 22:36:11 +0000 (+0100) Subject: Return early from appendThemeTemplates X-Git-Tag: v0.16~220 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3529152efe321b2c26636c2f04a508cf9133991c;p=brevno-suite%2Fhugo Return early from appendThemeTemplates --- diff --git a/hugolib/site.go b/hugolib/site.go index a0324e23..5ff71b6c 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1448,31 +1448,33 @@ func errorCollator(results <-chan error, errs chan<- error) { } func (s *Site) appendThemeTemplates(in []string) []string { - if s.hasTheme() { - out := []string{} - // First place all non internal templates - for _, t := range in { - if !strings.HasPrefix(t, "_internal/") { - out = append(out, t) - } + if !s.hasTheme() { + 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) - } + // 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) - } + // Lastly place internal templates + for _, t := range in { + if strings.HasPrefix(t, "_internal/") { + out = append(out, t) } - return out } - return in + return out + } type taxRenderInfo struct {