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

app/changelogs/v2.10.15/v2.10.15.md

@@ -35,6 +35,7 @@ Below are the detailed changes in this version.
 * [Editor missing after close all tabs when has pin tabs](https://github.com/siyuan-note/siyuan/issues/9624)
 * [Data synchronization accidentally deletes local files](https://github.com/siyuan-note/siyuan/issues/9631)
 * [The window title is hidden after the graph is minimized](https://github.com/siyuan-note/siyuan/issues/9638)
+* [Code content in templates is not properly escaped](https://github.com/siyuan-note/siyuan/issues/9649)
 
 ### Document
 

app/changelogs/v2.10.15/v2.10.15_zh_CHT.md

@@ -35,6 +35,7 @@
 * [存在固定頁籤時關閉所有頁籤導致編輯器異常](https://github.com/siyuan-note/siyuan/issues/9624)
 * [資料同步誤刪本機檔案](https://github.com/siyuan-note/siyuan/issues/9631)
 * [關係圖最小化後視窗標題被隱藏](https://github.com/siyuan-note/siyuan/issues/9638)
+* [未正確轉義範本程式碼內容](https://github.com/siyuan-note/siyuan/issues/9649)
 
 ### 改進文檔
 

app/changelogs/v2.10.15/v2.10.15_zh_CN.md

@@ -35,6 +35,7 @@
 * [存在固定页签时关闭所有页签导致编辑器异常](https://github.com/siyuan-note/siyuan/issues/9624)
 * [数据同步误删本地文件](https://github.com/siyuan-note/siyuan/issues/9631)
 * [关系图最小化后窗口标题被隐藏](https://github.com/siyuan-note/siyuan/issues/9638)
+* [未正确转义模板代码内容](https://github.com/siyuan-note/siyuan/issues/9649)
 
 ### 改进文档
 

kernel/model/index_fix.go

@@ -74,7 +74,7 @@ func removeDuplicateDatabaseRefs() {
 	}
 
 	if 0 < len(duplicatedRootIDs) {
-		logging.LogWarnf("exist more than one ref duplicated [%d], reindex it", duplicatedRootIDs)
+		logging.LogWarnf("exist more than one ref duplicated [%d], reindex it", len(duplicatedRootIDs))
 	}
 }
 

kernel/model/template.go

@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/siyuan-note/siyuan/kernel/av"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -33,10 +32,11 @@ import (
 	"github.com/88250/lute/ast"
 	"github.com/88250/lute/parse"
 	"github.com/88250/lute/render"
-	sprig "github.com/Masterminds/sprig/v3"
+	"github.com/Masterminds/sprig/v3"
 	"github.com/araddon/dateparse"
 	"github.com/siyuan-note/filelock"
 	"github.com/siyuan-note/logging"
+	"github.com/siyuan-note/siyuan/kernel/av"
 	"github.com/siyuan-note/siyuan/kernel/search"
 	"github.com/siyuan-note/siyuan/kernel/sql"
 	"github.com/siyuan-note/siyuan/kernel/treenode"
@@ -147,6 +147,25 @@ func DocSaveAsTemplate(id, name string, overwrite bool) (code int, err error) {
 	tree := prepareExportTree(bt)
 	addBlockIALNodes(tree, true)
 
+	ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
+		if !entering {
+			return ast.WalkContinue
+		}
+
+		// Code content in templates is not properly escaped https://github.com/siyuan-note/siyuan/issues/9649
+		switch n.Type {
+		case ast.NodeCodeBlockCode:
+			n.Tokens = bytes.ReplaceAll(n.Tokens, []byte("""), []byte("\""))
+		case ast.NodeCodeSpanContent:
+			n.Tokens = bytes.ReplaceAll(n.Tokens, []byte("""), []byte("\""))
+		case ast.NodeTextMark:
+			if n.IsTextMarkType("code") {
+				n.TextMarkTextContent = strings.ReplaceAll(n.TextMarkTextContent, """, "\"")
+			}
+		}
+		return ast.WalkContinue
+	})
+
 	luteEngine := NewLute()
 	formatRenderer := render.NewFormatRenderer(tree, luteEngine.RenderOptions)
 	md := formatRenderer.Render()