Handle disabled RSS even if it's defined in outputs

See https://github.com/gohugoio/hugo/issues/6897#issuecomment-587947078
This commit is contained in:
Bjørn Erik Pedersen 2020-02-19 08:38:46 +01:00
parent c7975b48b6
commit da54787cfa
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
4 changed files with 31 additions and 8 deletions

View file

@ -15,6 +15,7 @@ package hugolib
import (
"fmt"
"strings"
"github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/output"
@ -54,7 +55,7 @@ func createDefaultOutputFormats(allFormats output.Formats, cfg config.Provider)
}
func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) {
func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider, rssDisabled bool) (map[string]output.Formats, error) {
defaultOutputFormats := createDefaultOutputFormats(allFormats, cfg)
if !cfg.IsSet("outputs") {
@ -82,6 +83,12 @@ func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (ma
for _, format := range vals {
f, found := allFormats.GetByName(format)
if !found {
if rssDisabled && strings.EqualFold(format, "RSS") {
// This is legacy behaviour. We used to have both
// a RSS page kind and output format.
continue
}
return nil, fmt.Errorf("failed to resolve output format %q from site config", format)
}
formats = append(formats, f)