mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-17 21:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

hugolib: Fix inline shortcode regression

Browse Source 
Fixes #6677
This commit is contained in:
Bjørn Erik Pedersen
2019-12-28 12:07:23 +01:00
parent 6b59b64f02
commit 5509954c7e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hugolib/shortcode.go
View File

@@ -196,7 +196,16 @@ type shortcode struct {
}
func (s shortcode) insertPlaceholder() bool {
return !s.doMarkup || s.info.ParseInfo().Config.Version == 1
return !s.doMarkup || s.configVersion() == 1
}
func (s shortcode) configVersion() int {
if s.info == nil {
// Not set for inline shortcodes.
return 2
}
return s.info.ParseInfo().Config.Version
}
func (s shortcode) innerString() string {
@@ -347,7 +356,7 @@ func renderShortcode(
// Pre Hugo 0.55 this was the behaviour even for the outer-most
// shortcode.
if sc.doMarkup && (level > 0 || sc.info.ParseInfo().Config.Version == 1) {
if sc.doMarkup && (level > 0 || sc.configVersion() == 1) {
var err error
b, err := p.pageOutput.cp.renderContent([]byte(inner), false)