diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go index 2d8adfc3e..3152f6dc0 100644 --- a/kernel/model/blockinfo.go +++ b/kernel/model/blockinfo.go @@ -493,6 +493,7 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bo } name = strings.ReplaceAll(name, editor.Caret, "") + name = util.UnescapeHTML(name) name = util.EscapeHTML(name) if !isEmbedBlock && parent == node { diff --git a/kernel/model/render.go b/kernel/model/render.go index 565fa9bf5..1a9cb6963 100644 --- a/kernel/model/render.go +++ b/kernel/model/render.go @@ -18,13 +18,13 @@ package model import ( "bytes" - "github.com/88250/lute/editor" "regexp" "strings" "github.com/88250/gulu" "github.com/88250/lute" "github.com/88250/lute/ast" + "github.com/88250/lute/editor" "github.com/88250/lute/html" "github.com/88250/lute/parse" "github.com/88250/lute/render" @@ -110,6 +110,7 @@ func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) { ret = sql.NodeStaticContent(node, excludeTypes, false, false, false) ret = strings.TrimSpace(ret) ret = strings.ReplaceAll(ret, "\n", "") + ret = util.UnescapeHTML(ret) ret = util.EscapeHTML(ret) ret = strings.TrimSpace(ret) if "" == ret {