From 0ae24f6088361e2c8c4e03ddfdb99b28d580ae3f Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Thu, 30 Dec 2021 18:26:32 +0000 Subject: [PATCH] [CORE][Controller][FeedController] Use controller instance for filtering, making FeedControler->postProcess function non-static --- src/Core/Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Core/Controller.php b/src/Core/Controller.php index 30d8fee0bc..62635e243a 100644 --- a/src/Core/Controller.php +++ b/src/Core/Controller.php @@ -132,14 +132,14 @@ abstract class Controller extends AbstractController implements EventSubscriberI Event::handle('OverrideTemplate', [$this->vars, &$template]); // Allow plugins to replace the template used for anything unset($this->vars['_template'], $response['_template']); - $controller = $request->get('_controller'); + $controller = $this->vars['controller']; if (\is_array($controller)) { $controller = $controller[0]; } // XXX: Could we do this differently? if (is_subclass_of($controller, FeedController::class)) { - $this->vars = FeedController::postProcess($this->vars); + $this->vars = $controller->postProcess($this->vars); } // Respond in the most preferred acceptable content type