From f1a00b2069ede85feb487d29b9f690396e2402c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 21 Sep 2018 14:30:57 +0200 Subject: hugolib: Remove deprecated rssURI --- hugolib/site_output.go | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'hugolib/site_output.go') diff --git a/hugolib/site_output.go b/hugolib/site_output.go index f81162e43..0e0fe76a7 100644 --- a/hugolib/site_output.go +++ b/hugolib/site_output.go @@ -15,11 +15,8 @@ package hugolib import ( "fmt" - "path" - "strings" "github.com/gohugoio/hugo/config" - "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/output" "github.com/spf13/cast" ) @@ -30,20 +27,6 @@ func createDefaultOutputFormats(allFormats output.Formats, cfg config.Provider) robotsOut, _ := allFormats.GetByName(output.RobotsTxtFormat.Name) sitemapOut, _ := allFormats.GetByName(output.SitemapFormat.Name) - // TODO(bep) this mumbo jumbo is deprecated and should be removed, but there are tests that - // depends on this, so that will have to wait. - rssBase := cfg.GetString("rssURI") - if rssBase == "" || rssBase == "index.xml" { - rssBase = rssOut.BaseName - } else { - // Remove in Hugo 0.36. - helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", true) - // RSS has now a well defined media type, so strip any suffix provided - rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase)) - } - - rssOut.BaseName = rssBase - return map[string]output.Formats{ KindPage: output.Formats{htmlOut}, KindHome: output.Formats{htmlOut, rssOut}, -- cgit v1.2.3