From 01b19ea2c85c7f039ff427b03d6a2f0d7f4b0488 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 13 Oct 2023 14:03:41 +0800
Subject: [PATCH 1/2] :art: Fix database table view loading
 https://ld246.com/article/1697168944677

---
 kernel/av/av.go                | 6 +++++-
 kernel/model/attribute_view.go | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kernel/av/av.go b/kernel/av/av.go
index 6cfd6bdbc..0b766a7ef 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -521,7 +521,11 @@ func SaveAttributeView(av *AttributeView) (err error) {
 			for _, v := range kv.Values {
 				if 0 == v.Block.Created {
 					if "" == v.Block.ID {
-						v.Block.ID = ast.NewNodeID()
+						v.Block.ID = v.BlockID
+						if "" == v.Block.ID {
+							v.Block.ID = ast.NewNodeID()
+							v.BlockID = v.Block.ID
+						}
 					}
 
 					createdStr := v.Block.ID[:len("20060102150405")]
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index c8d21b341..038f081ef 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -191,7 +191,11 @@ func RenderAttributeView(avID string) (viewable av.Viewable, attrView *av.Attrib
 			for _, v := range kv.Values {
 				if 0 == v.Block.Created {
 					if "" == v.Block.ID {
-						v.Block.ID = ast.NewNodeID()
+						v.Block.ID = v.BlockID
+						if "" == v.Block.ID {
+							v.Block.ID = ast.NewNodeID()
+							v.BlockID = v.Block.ID
+						}
 					}
 
 					createdStr := v.Block.ID[:len("20060102150405")]

From daa9ddfd50eebdc98084d3aba28f09008294ba54 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 13 Oct 2023 14:43:43 +0800
Subject: [PATCH 2/2] :art: Don't load plugin when the user hasn't agreed to
 trust bazaar content yet Fix
 https://github.com/siyuan-note/siyuan/issues/9426

---
 kernel/model/plugin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/plugin.go b/kernel/model/plugin.go
index 1bdccc709..f873b7316 100644
--- a/kernel/model/plugin.go
+++ b/kernel/model/plugin.go
@@ -74,7 +74,7 @@ func SetPetalEnabled(name string, enabled bool, frontend string) (ret *Petal, er
 func LoadPetals(frontend string) (ret []*Petal) {
 	ret = []*Petal{}
 
-	if Conf.Bazaar.PetalDisabled {
+	if Conf.Bazaar.PetalDisabled || !Conf.Bazaar.Trust {
 		return
 	}