shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Remove deprecated rssURI

--- a/hugolib/config.go

+++ b/hugolib/config.go

@@ -471,7 +471,7 @@

 	v.SetDefault("disableFastRender", false)

 	v.SetDefault("timeout", 10000) // 10 seconds

-	// Remove in Hugo 0.39

+	// Remove in Hugo 0.50

 	if v.GetBool("useModTimeAsFallback") {

@@ -480,7 +480,7 @@

 [frontmatter]

 date = [ "date",":fileModTime", ":default"]

 lastmod = ["lastmod" ,":fileModTime", ":default"]

-`, false)

+`, true)

 	}

--- a/hugolib/rss_test.go

+++ b/hugolib/rss_test.go

@@ -30,10 +30,9 @@

 	rssLimit := len(weightedSources) - 1

-	rssURI := "customrss.xml"

+	rssURI := "index.xml"

 	cfg.Set("baseURL", "http://auth/bub/")

-	cfg.Set("rssURI", rssURI)

 	cfg.Set("title", "RSSTest")

 	cfg.Set("rssLimit", rssLimit)

--- a/hugolib/site_output.go

+++ b/hugolib/site_output.go

@@ -15,11 +15,8 @@

 import (

 	"fmt"

-	"path"

-	"strings"

 	"github.com/gohugoio/hugo/config"

-	"github.com/gohugoio/hugo/helpers"

 	"github.com/gohugoio/hugo/output"

 	"github.com/spf13/cast"

 )

@@ -29,20 +26,6 @@

 	htmlOut, _ := allFormats.GetByName(output.HTMLFormat.Name)

 	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},