0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-12-18 20:14:58 +08:00
commit 1be47953b8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/tag.go
View file

@ -328,7 +328,7 @@ func labelTags() (ret map[string]Tags) {
tagSpans := sql.QueryTagSpans("")
for _, tagSpan := range tagSpans {
label := tagSpan.Content
label := util.UnescapeHTML(tagSpan.Content)
if _, ok := ret[label]; ok {
ret[label] = append(ret[label], &Tag{})
} else {

6
kernel/search/mark.go
View file

@ -95,7 +95,7 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
if splitWords {
wordBoundary = lex.IsASCIILetterNums(gulu.Str.ToBytes(k)) // Improve virtual reference split words https://github.com/siyuan-note/siyuan/issues/7833
}
k = regexp.QuoteMeta(k)
k = regexp.QuoteMeta(util.EscapeHTML(k))
re += "("
if wordBoundary {
re += "\\b"
@ -110,10 +110,10 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
}
}
re += ")"
ret = text
ret = util.EscapeHTML(text)
if reg, err := regexp.Compile(re); err == nil {
ret = reg.ReplaceAllStringFunc(text, func(s string) string { return openMark + util.EscapeHTML(s) + closeMark })
ret = reg.ReplaceAllStringFunc(ret, func(s string) string { return openMark + s + closeMark })
}
// 搜索结果预览包含转义符问题 Search results preview contains escape character issue https://github.com/siyuan-note/siyuan/issues/9790