Merge branch hotfix/v2.3.1

roadiz-ci · roadiz-ci · commit 0ef172448438 · 2024-05-22T14:10:58.000Z
diff --git a/config/services.yaml b/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.0'
+    roadiz_core.cms_version: '2.3.1'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"
diff --git a/src/Node/NodeFactory.php b/src/Node/NodeFactory.php
@@ -47,9 +47,10 @@ public function create(
             $node->setNodeType($type);
         }
 
-        if ($type instanceof NodeType) {
-            $node->setTtl($type->getDefaultTtl());
+        if ($node->getNodeType() instanceof NodeType) {
+            $node->setTtl($node->getNodeType()->getDefaultTtl());
         }
+
         if (null !== $parent) {
             $node->setParent($parent);
         }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,10 @@ public function create(`
`47`	`47`	`$node->setNodeType($type);`
`48`	`48`	`}`
`49`	`49`
`50`		`- if ($type instanceof NodeType) {`
`51`		`- $node->setTtl($type->getDefaultTtl());`
	`50`	`+ if ($node->getNodeType() instanceof NodeType) {`
	`51`	`+ $node->setTtl($node->getNodeType()->getDefaultTtl());`
`52`	`52`	`}`
	`53`	`+`
`53`	`54`	`if (null !== $parent) {`
`54`	`55`	`$node->setParent($parent);`
`55`	`56`	`}`