fix #4201 【カスタムコンテンツ】特定のカスタムコンテンツでプレビューを押すとエラーになる問題を解決

Author: katokaisya

plugins/bc-custom-content/src/Service/Front/CustomContentFrontService.php

@@ -364,11 +364,17 @@ public function setupPreviewForView(Controller $controller): void
         }
 
         $events = BcUtil::offEvent($customEntriesTable->getEventManager(), 'Model.beforeMarshal');
-        $entity = $customEntriesTable->saveTmpFiles($postEntity, mt_rand(0, 99999999));
+
+        if ($postEntity && $customEntriesTable->hasBehavior('BcUpload')) {
+            // BcUpload ビヘイビアがある場合は、アップロードファイルを保存
+            $entity = $customEntriesTable->saveTmpFiles($postEntity, mt_rand(0, 99999999));
+            $postEntity = $entity->toArray();
+        }
         $entity = $customEntriesTable->patchEntity(
             $customEntry ?? $customEntriesTable->newEmptyEntity(),
-            ($postEntity)? $entity->toArray(): []
+            $postEntity
         );
+
         BcUtil::onEvent($customEntriesTable->getEventManager(), 'Model.beforeMarshal', $events);
 
         $entity = $customEntriesTable->decodeRow($entity);