hugolib: Read media types and output formats from site config

Closes #3222
Closes #3223
This commit is contained in:
Bjørn Erik Pedersen
2017-04-04 09:12:33 +02:00
parent f8d555cca5
commit 10ff2f31a6
3 changed files with 57 additions and 15 deletions

View File

@@ -23,7 +23,7 @@ import (
"github.com/spf13/hugo/output"
)
func createSiteOutputFormats(cfg config.Provider) (map[string]output.Formats, error) {
func createSiteOutputFormats(allFormats output.Formats, cfg config.Provider) (map[string]output.Formats, error) {
if !cfg.IsSet("outputs") {
return createDefaultOutputFormats(cfg)
}
@@ -40,7 +40,7 @@ func createSiteOutputFormats(cfg config.Provider) (map[string]output.Formats, er
var formats output.Formats
vals := cast.ToStringSlice(v)
for _, format := range vals {
f, found := output.DefaultFormats.GetByName(format)
f, found := allFormats.GetByName(format)
if !found {
return nil, fmt.Errorf("Failed to resolve output format %q from site config", format)
}