summaryrefslogtreecommitdiffstats
path: root/hugolib/site_output.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-04-04 09:12:33 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-04-04 15:12:30 +0200
commit10ff2f31a6ff3c0de292c7810f74edebfc2c0fb4 (patch)
tree3cbb6dc222452351f1c7f65e3a3ca201105a9714 /hugolib/site_output.go
parentf8d555cca59a48df9cde2e7323ff2d500e0590a3 (diff)
hugolib: Read media types and output formats from site config
Closes #3222 Closes #3223
Diffstat (limited to 'hugolib/site_output.go')
-rw-r--r--hugolib/site_output.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index 5ac5fe1f7..acd5d1cd1 100644
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -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)
}