simplify rssuri logic

diff --git a/hugolib/site.go b/hugolib/site.go
index 3fe0284aff366ec8f5aa3dfd17fe7bba149dfc00..09d42d68657e53ff16aa6551dc38f18652b6f99e 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1125,11 +1125,12 @@ func taxonomyRenderer(s *Site, taxes <-chan taxRenderInfo, results chan<- error,
 
                if !viper.GetBool("DisableRSS") {
                        // XML Feed
-                       n.URL = s.permalinkStr(base + "/" + viper.GetString("RSSUri"))
+            rssuri := viper.GetString("RSSUri")
+                       n.URL = s.permalinkStr(base + "/" + rssuri )
                        n.Permalink = s.permalink(base)
                        rssLayouts := []string{"taxonomy/" + t.singular + ".rss.xml", "_default/rss.xml", "rss.xml", "_internal/_default/rss.xml"}
 
-                       if err := s.renderAndWriteXML("taxonomy "+t.singular+" rss", base+"/"+viper.GetString("RSSUri"), n, s.appendThemeTemplates(rssLayouts)...); err != nil {
+                       if err := s.renderAndWriteXML("taxonomy "+t.singular+" rss", base+"/"+rssuri, n, s.appendThemeTemplates(rssLayouts)...); err != nil {
                                results <- err
                                continue
                        }
@@ -1231,10 +1232,11 @@ func (s *Site) RenderSectionLists() error {
 
                if !viper.GetBool("DisableRSS") && section != "" {
                        // XML Feed
-                       n.URL = s.permalinkStr(section + "/" + viper.GetString("RSSUri"))
+            rssuri := viper.GetString("RSSUri")
+                       n.URL = s.permalinkStr(section + "/" + rssuri)
                        n.Permalink = s.permalink(section)
                        rssLayouts := []string{"section/" + section + ".rss.xml", "_default/rss.xml", "rss.xml", "_internal/_default/rss.xml"}
-                       if err := s.renderAndWriteXML("section "+section+" rss", section+"/"+viper.GetString("RSSUri"), n, s.appendThemeTemplates(rssLayouts)...); err != nil {
+                       if err := s.renderAndWriteXML("section "+section+" rss", section+"/"+rssuri, n, s.appendThemeTemplates(rssLayouts)...); err != nil {
                                return err
                        }
                }