From 7da0cb557f4157781f8422076a8149c9e5f7421b Mon Sep 17 00:00:00 2001
From: kato <kato@e-catchup.jp>
Date: Wed, 10 Apr 2024 13:18:24 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#3328=20=E3=83=87=E3=83=90=E3=83=83?=
 =?UTF-8?q?=E3=82=B0=E3=83=A2=E3=83=BC=E3=83=89=E3=81=A7=E3=80=81=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92=E7=B7=A8=E9=9B=86?=
 =?UTF-8?q?=E3=81=A7=E9=96=8B=E3=81=8D=E3=80=81=E3=83=97=E3=83=AC=E3=83=93?=
 =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E3=82=AF?=
 =?UTF-8?q?=E3=83=AA=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=81=A8=E3=80=81?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=8C=E5=87=BA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E8=A7=A3=E6=B1=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Baser/Controller/PagesController.php         | 2 +-
 lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Baser/Controller/PagesController.php b/lib/Baser/Controller/PagesController.php
index 65c4e14bb1..e472c89b7a 100644
--- a/lib/Baser/Controller/PagesController.php
+++ b/lib/Baser/Controller/PagesController.php
@@ -456,7 +456,7 @@ public function display()
 			if ($this->BcContents->preview === 'default') {
 				$sessionKey = __CLASS__ . '_preview_default_' . $this->request->params['Content']['entity_id'];
 				$previewData = $this->Session->read($sessionKey);
-				$this->request->params['Content']['eyecatch'] = $previewData['Content']['eyecatch'];
+				$this->request->params['Content']['eyecatch'] = !empty($previewData['Content']['eyecatch']) ? $previewData['Content']['eyecatch'] : '';
 
 				if (!is_null($previewData)) {
 					$this->Session->delete($sessionKey);
diff --git a/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php b/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php
index 05b5ab4323..20b8e0727a 100755
--- a/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php
+++ b/lib/Baser/Plugin/Blog/View/Helper/BlogHelper.php
@@ -79,7 +79,7 @@ public function setContent($blogContentId = null)
 		}
 
 		if (empty($this->blogContent)) {
-			if (!empty($this->request->query['preview']) && $this->request->query['preview'] == 'default' && $this->request->data['BlogContent']) {
+			if (!empty($this->request->query['preview']) && $this->request->query['preview'] == 'default' && !empty($this->request->data['BlogContent'])) {
 				$this->blogContent = $this->request->data['BlogContent'];
 				$blogContentUpdated = true;