diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-01-31 11:53:21 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-01-31 19:08:19 +0100 |
| commit | c52045bbb38cbf64b9cb39352230060aa122cc9f (patch) | |
| tree | 4fb593b4d9ffc02ba5ece270c86437d5d6ddf809 /hugolib/shortcode.go | |
| parent | 8ed2a1caa9e0892d5bf97ed1b7279befa159f764 (diff) | |
Fix some inline shortcode issues
Fixes #5645
Fixes #5653
Diffstat (limited to 'hugolib/shortcode.go')
| -rw-r--r-- | hugolib/shortcode.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 6d87414a7..cd2f268f1 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -338,14 +338,9 @@ func (s *shortcodeHandler) prepareShortcodeForPage(placeholder string, sc *short if sc.isInline { key := newScKeyFromLangAndOutputFormat(lang, p.outputFormats[0], placeholder) - if !s.enableInlineShortcodes { - m[key] = func() (string, error) { - return "", nil - } - } else { - m[key] = func() (string, error) { - return renderShortcode(key, sc, nil, p) - } + m[key] = func() (string, error) { + return renderShortcode(key, sc, nil, p) + } return m @@ -372,6 +367,9 @@ func renderShortcode( var tmpl tpl.Template if sc.isInline { + if !p.s.enableInlineShortcodes { + return "", nil + } templName := path.Join("_inline_shortcode", p.Path(), sc.name) if sc.isClosing { templStr := sc.innerString() @@ -542,6 +540,10 @@ func (s *shortcodeHandler) contentShortcodesForOutputFormat(f output.Format) *or if !found && key.Suffix != "html" { key.Suffix = "html" renderFn, found = s.contentShortcodes.Get(key) + if !found { + key.OutputFormat = "HTML" + renderFn, found = s.contentShortcodes.Get(key) + } } if !found { |