commit b716dbec1dadeb7fa6164eb10a3df427edd9d3de
parent 55fcd2f30f4358a800932aa60160935c0c22f96d
Author: Chase Adams <chaadams@zappos.com>
Date: Fri, 14 Nov 2014 09:14:52 -0800
Fix template checking order in site.go
- Change order of HasPrefix to match correct order
- Remove theme concatenation to _internal in last loop of
appendthemetemplates so it looks in the right place for internal
templates
Conflicts:
hugolib/site.go
Diffstat:
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hugolib/site.go b/hugolib/site.go
@@ -766,21 +766,22 @@ func (s *Site) appendThemeTemplates(in []string) []string {
out := []string{}
// First place all non internal templates
for _, t := range in {
- if !strings.HasPrefix("_internal/", t) {
+ if !strings.HasPrefix(t, "_internal/") {
out = append(out, t)
}
}
// Then place theme templates with the same names
for _, t := range in {
- if !strings.HasPrefix("_internal/", t) {
+ if !strings.HasPrefix(t, "_internal/") {
out = append(out, "theme/"+t)
}
}
+
// Lastly place internal templates
for _, t := range in {
- if strings.HasPrefix("_internal/", t) {
- out = append(out, "theme/"+t)
+ if strings.HasPrefix(t, "_internal/") {
+ out = append(out, t)
}
}
return out
@@ -936,6 +937,7 @@ func (s *Site) RenderSectionLists() error {
if !viper.GetBool("DisableRSS") {
// XML Feed
+ fmt.Println("Section...")
rssLayouts := []string{"section/" + section + ".rss.xml", "_default/rss.xml", "rss.xml", "_internal/_default/rss.xml"}
s.setUrls(n, section+".xml")
b, err = s.renderXML("section "+section+" rss", n, s.appendThemeTemplates(rssLayouts)...)