tweak

craftcms · Sep 19, 2024 · 1801b9b · 1801b9b
1 parent 99ee05c
commit 1801b9b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/models/FieldLayout.php b/src/models/FieldLayout.php
@@ -822,15 +822,17 @@ public function getCardBodyElements(?ElementInterface $element = null, array $ca
             foreach ($cardElements as $cardElement) {
                 if (str_starts_with($cardElement['value'], 'layoutElement:')) {
                     $uid = str_replace('layoutElement:', '', $cardElement['value']);
-                    $fieldId = $cardElement['fieldId'];
-                    $element = $this->getElementByUid($uid);
-                    if ($element === null) {
-                        $field = Craft::$app->getFields()->getFieldById($fieldId);
-                        $element = new CustomField();
-                        $element->setField($field);
+                    $layoutElement = $this->getElementByUid($uid);
+                    if ($layoutElement === null) {
+                        $fieldId = $cardElement['fieldId'];
+                        if ($fieldId) {
+                            $field = Craft::$app->getFields()->getFieldById($fieldId);
+                            $layoutElement = new CustomField();
+                            $layoutElement->setField($field);
+                        }
                     }
 
-                    $layoutElements[$cardElement['value']] = $element;
+                    $layoutElements[$cardElement['value']] = $layoutElement;
                 }
             }
         }