fix #1242 admin-thirdテーマでコンテンツが重複して表示される問題を改善

baserproject · Oct 16, 2019 · 9320022 · 9320022
1 parent 36bfc59
commit 9320022
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Baser/Plugin/Blog/Config/setting.php b/lib/Baser/Plugin/Blog/Config/setting.php
@@ -19,8 +19,9 @@
 			'BlogTags' => ['title' => 'ブログタグ設定', 'url' => ['admin' => true, 'plugin' => 'blog', 'controller' => 'blog_tags', 'action' => 'index']],
 		]
 ]];
+/* @var BlogContent $BlogContent */
 $BlogContent = ClassRegistry::init('Blog.BlogContent');
-$blogContents = $BlogContent->find('all', ['recursive' => 0]);
+$blogContents = $BlogContent->find('all', ['conditions' => [$BlogContent->Content->getConditionAllowPublish()], 'recursive' => 0]);
 foreach ($blogContents as $blogContent) {
 	$blog = $blogContent['BlogContent'];
 	$content = $blogContent['Content'];

diff --git a/lib/Baser/Plugin/Mail/Config/setting.php b/lib/Baser/Plugin/Mail/Config/setting.php
@@ -20,8 +20,9 @@
 		]
 	]
 ];
+/* @var MailContent $MailContent */
 $MailContent = ClassRegistry::init('Mail.MailContent');
-$mailContents = $MailContent->find('all', ['recursive' => 0]);
+$mailContents = $MailContent->find('all', ['conditions' => [$MailContent->Content->getConditionAllowPublish()], 'recursive' => 0]);
 foreach ($mailContents as $mailContent) {
 	$mail = $mailContent['MailContent'];
 	$content = $mailContent['Content'];