simplify rssuri logic - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 5c1204c24b0e5669dbfc2b43ddb9f3fd9b59a354
DIR parent 062f6c33837dc9755959ca9f3a5659204b0b3857
HTML Author: spf13 <steve.francia@gmail.com>
Date: Thu, 12 Nov 2015 11:09:20 -0500
simplify rssuri logic
Diffstat:
M hugolib/site.go | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
DIR diff --git 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
}
}