ref: d5a0b6bbbc83a3e274c62ed397a293f04ee8d241
parent: 5178cd13a7da3c5f5ec5d3217c9e40fc0be7152a
author: Bjørn Erik Pedersen <[email protected]>
date: Mon Dec 17 05:47:11 EST 2018
hugolib: Remove "double layout" lookup Fixes #5390
--- a/go.sum
+++ b/go.sum
@@ -72,6 +72,7 @@
github.com/magefile/mage v1.4.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA=
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 h1:LZhVjIISSbj8qLf2qDPP0D8z0uvOWAW5C85ly5mJW6c=
github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -486,7 +486,7 @@
smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"}return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemapindex",
- sitemapDefault.Filename, h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...)
+ sitemapDefault.Filename, h.toSiteInfos(), smLayouts...)
}
func (h *HugoSites) assignMissingTranslations() error {--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1648,36 +1648,6 @@
close(errs)
}
-func (s *Site) appendThemeTemplates(in []string) []string {- if !s.PathSpec.ThemeSet() {- 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
-
-}
-
// GetPage looks up a page of a given type for the given ref.
// In Hugo <= 0.44 you had to add Page Kind (section, home) etc. as the first
// argument and then either a unix styled path (with or without a leading slash))
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -303,7 +303,7 @@
s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err)}
- return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, pageOutput, s.appendThemeTemplates(nfLayouts)...)
+ return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, pageOutput, nfLayouts...)
}
func (s *Site) renderSitemap() error {@@ -354,7 +354,7 @@
addLanguagePrefix := n.Site.IsMultiLingual()
return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemap",
- n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...)
+ n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, smLayouts...)
}
func (s *Site) renderRobotsTXT() error {@@ -385,7 +385,7 @@
s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err)}
- return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", targetPath, pageOutput, s.appendThemeTemplates(rLayouts)...)
+ return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", targetPath, pageOutput, rLayouts...)
}