Skip to content

Commit 8f1f73b

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 2b22ff9 + 15231be commit 8f1f73b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/api/workspace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func setWorkspaceDir(c *gin.Context) {
289289
// 改进判断工作空间路径实现 https://github.com/siyuan-note/siyuan/issues/7569
290290
installDirLower := strings.ToLower(filepath.Dir(util.WorkingDir))
291291
pathLower := strings.ToLower(path)
292-
if strings.HasPrefix(pathLower, installDirLower) && util.IsSubPath(installDirLower, pathLower) {
292+
if strings.HasPrefix(pathLower, installDirLower) && (util.IsSubPath(installDirLower, pathLower) || filepath.Clean(installDirLower) == filepath.Clean(pathLower)) {
293293
ret.Code = -1
294294
ret.Msg = model.Conf.Language(98)
295295
ret.Data = map[string]interface{}{"closeTimeout": 5000}

0 commit comments

Comments
 (0)