tpl: Fix RSS template for the terms listing

Fixes #6909

diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index abe4b97cd69792ee876a2467853197759bf2d29b..6d049a0c3167e5e4fe55e211f2780449a4d74ede 100644 (file)
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -561,6 +561,6 @@ categories: ["funny"]
        b.Assert(funny.Parent(), qt.Equals, cat)
 
        b.AssertFileContent("public/categories/funny/index.xml", `<link>http://example.com/p/</link>`)
-       // TODO https://github.com/gohugoio/hugo/issues/6909    b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)
+       b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)
 
 }

diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index f64f18ee167c245a8b72aaa2b1ce983d0750d229..c9dec898842840adcc2ebee4fc39aef66886cf74 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -21,7 +21,12 @@ var EmbeddedTemplates = [][2]string{
        {`_default/robots.txt`, `User-agent: *`},
        {`_default/rss.xml`, `{{- $pctx := . -}}
 {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
-{{- $pages := $pctx.RegularPages -}}
+{{- $pages := slice -}}
+{{- if eq $.Kind "taxonomyTerm" -}}
+{{- $pages = $pctx.Pages -}}
+{{- else -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- end -}}
 {{- $limit := .Site.Config.Services.RSS.Limit -}}
 {{- if ge $limit 1 -}}
 {{- $pages = $pages | first $limit -}}

diff --git a/tpl/tplimpl/embedded/templates/_default/rss.xml b/tpl/tplimpl/embedded/templates/_default/rss.xml
index 3e17f48c6a3c6386d8fbb4391c31f5abc9c3f894..5ec2025b6c6c9b571aaae67c38c635601858f59e 100644 (file)
--- a/tpl/tplimpl/embedded/templates/_default/rss.xml
+++ b/tpl/tplimpl/embedded/templates/_default/rss.xml
@@ -1,6 +1,11 @@
 {{- $pctx := . -}}
 {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
-{{- $pages := $pctx.RegularPages -}}
+{{- $pages := slice -}}
+{{- if eq $.Kind "taxonomyTerm" -}}
+{{- $pages = $pctx.Pages -}}
+{{- else -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- end -}}
 {{- $limit := .Site.Config.Services.RSS.Limit -}}
 {{- if ge $limit 1 -}}
 {{- $pages = $pages | first $limit -}}