From 5890e881f97b8f582dd0c2a304de9e2a3f9154ae Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Wed, 18 Jan 2023 11:09:41 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E8=A6=8F=E3=81=AE=E3=81=8A?=
 =?UTF-8?q?=E7=9F=A5=E3=82=89=E3=81=9B=E3=82=92=E7=99=BB=E9=8C=B2=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E6=96=B0=E7=9D=80=E3=81=AE?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=ABframe=5Fid=E3=81=8C?=
 =?UTF-8?q?=E5=85=A5=E3=82=89=E3=81=9A=E3=80=81=E6=96=B0=E7=9D=80=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E9=81=B7=E7=A7=BB=E3=81=97=E3=81=A6=E7=B7=A8=E9=9B=86?=
 =?UTF-8?q?=E3=81=97=E3=82=88=E3=81=86=E3=81=A8=E3=81=99=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E6=96=B0=E8=A6=8F=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B?=
 =?UTF-8?q?=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AB=E6=96=B0=E7=9D=80=E3=81=AE?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=ABframe=5Fid=E3=81=8C?=
 =?UTF-8?q?=E5=85=A5=E3=82=8B=E6=A7=98=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/Announcement.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Model/Announcement.php b/Model/Announcement.php
index 0f72080..ecf9cbc 100644
--- a/Model/Announcement.php
+++ b/Model/Announcement.php
@@ -130,6 +130,12 @@ public function beforeValidate($options = array()) {
  * @see Model::save()
  */
 	public function beforeSave($options = array()) {
+		// 新規登録時でCurrent Frame.block_idがnullならCurrent Frame.block_idをセットする
+		// ここでFrame.block_idをセットしておかないと新着プラグインにFrame.idが登録されない。
+		// @see app/Plugin/Topics/Model/Behavior/TopicsBaseBehavior.php:109
+		if (Current::read('Frame.block_id') === null) {
+			Current::write('Frame.block_id', Current::read('Block.id'));
+		}
 		$this->loadModels([
 			'AnnouncementSetting' => 'Announcements.AnnouncementSetting',
 		]);