Skip to content

Commit 624e089

Browse files
committed
【フィード 】index.rssがErrorになる問題を改善 fix baserproject#4176
1 parent ec1e38c commit 624e089

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

plugins/baser-core/src/Controller/AppController.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,18 @@ public function beforeRender(EventInterface $event)
255255
*/
256256
public function setupFrontView(): void
257257
{
258-
$this->viewBuilder()->setClassName('BaserCore.BcFrontApp');
259-
$this->viewBuilder()->setTheme(BcUtil::getCurrentTheme());
258+
$builder = $this->viewBuilder();
259+
$builder->setClassName('BaserCore.BcFrontApp');
260+
$builder->setTheme(BcUtil::getCurrentTheme());
261+
if($this->getRequest()->is('rss')) {
262+
$response = $this->getResponse();
263+
$this->setResponse($response
264+
->withType($response->getMimeType('rss'))
265+
->withCharset(Configure::read('App.encoding'))
266+
);
267+
$builder->setTemplatePath((string)$builder->getTemplatePath() . DS . 'rss');
268+
$builder->setLayoutPath('rss');
269+
}
260270
}
261271

262272
/**

plugins/bc-blog/src/Service/Front/BlogFrontService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function getViewVarsForIndex(ServerRequest $request, BlogContent $blogCon
122122
* @noTodo
123123
* @unitTest
124124
*/
125-
public function getViewVarsForIndexRss(ServerRequest $request, BlogContent $blogContent, ResultSet $posts): array
125+
public function getViewVarsForIndexRss(ServerRequest $request, BlogContent $blogContent, PaginatedResultSet $posts): array
126126
{
127127
$site = $request->getAttribute('currentSite');
128128
return [

0 commit comments

Comments
 (0)