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 2022-10-30 23:18:46 +08:00
commit 5e7a68888b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/setting.go
View file

@ -204,7 +204,7 @@ func setSearch(c *gin.Context) {
}
if 1 > s.Limit {
s.Limit = 32
s.Limit = 64
}
oldCaseSensitive := model.Conf.Search.CaseSensitive

6
kernel/model/conf.go
View file

@ -257,10 +257,16 @@ func InitConf() {
if 1 > Conf.Editor.HistoryRetentionDays {
Conf.Editor.HistoryRetentionDays = 7
}
if 1 > Conf.Editor.DynamicLoadBlocks {
Conf.Editor.DynamicLoadBlocks = 128
}
if nil == Conf.Search {
Conf.Search = conf.NewSearch()
}
if 1 > Conf.Search.Limit {
Conf.Search.Limit = 64
}
if nil == Conf.Stat {
Conf.Stat = conf.NewStat()