shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Final fix of rssURI deprecation

Fixes #3319

--- a/hugolib/site_output.go

+++ b/hugolib/site_output.go

@@ -76,13 +76,11 @@

 			rssType := output.RSSFormat

 			rssBase := cfg.GetString("rssURI")

-			if rssBase == "" {

+			if rssBase == "" || rssBase == "index.xml" {

 				rssBase = rssType.BaseName

 			} else {

 				// 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

 				rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase))

 			}