github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-15 03:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Final fix of rssURI deprecation

Browse source 
Fixes #3319
This commit is contained in:
Bjørn Erik Pedersen 2017-04-10 21:26:55 +02:00
parent cfd3af8e69
commit 9ec00725b7
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hugolib/site_output.go
View file

@ -76,13 +76,11 @@ func createDefaultOutputFormats(cfg config.Provider) (map[string]output.Formats,
rssType := output.RSSFormat rssType := output.RSSFormat
rssBase := cfg.GetString("rssURI") rssBase := cfg.GetString("rssURI")
if rssBase == "" { if rssBase == "" || rssBase == "index.xml" {
rssBase = rssType.BaseName rssBase = rssType.BaseName
} else { } else {
// Remove in Hugo 0.22. // Remove in Hugo 0.22.
if rssBase != "index.xml" {
helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", false) helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", false)
}
// RSS has now a well defined media type, so strip any suffix provided // RSS has now a well defined media type, so strip any suffix provided
rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase)) rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase))
} }