Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-08-07 12:15:16 +08:00
commit b044791a91
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/assets.go
View file

@ -545,7 +545,7 @@ func RenameAsset(oldPath, newName string) (err error) {
treenode.IndexBlockTree(tree)
sql.UpsertTreeQueue(tree)
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), tree.Root.IALAttr("title")))
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
}
}
}

4
kernel/model/bookmark.go
View file

@ -62,7 +62,7 @@ func RemoveBookmark(bookmark string) (err error) {
}
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), tree.Root.IALAttr("title")))
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = writeJSONQueue(tree); nil != err {
util.ClearPushProgress(100)
return
@ -120,7 +120,7 @@ func RenameBookmark(oldBookmark, newBookmark string) (err error) {
}
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), tree.Root.IALAttr("title")))
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = writeJSONQueue(tree); nil != err {
util.ClearPushProgress(100)
return

4
kernel/model/tag.go
View file

@ -92,7 +92,7 @@ func RemoveTag(label string) (err error) {
for _, n := range unlinks {
n.Unlink()
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), tree.Root.IALAttr("title")))
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = writeJSONQueue(tree); nil != err {
util.ClearPushProgress(100)
return
@ -175,7 +175,7 @@ func RenameTag(oldLabel, newLabel string) (err error) {
}
}
}
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), tree.Root.IALAttr("title")))
util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
if err = writeJSONQueue(tree); nil != err {
util.ClearPushProgress(100)
return