From a2a53848b02da402382b3af2183d1e78554ba9f7 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 26 Jul 2019 17:37:11 +0200 Subject: [PATCH] Update PreviewController The constructor is called with the userId. However if a user is not logged in this is null. Which means that we get an exception instead of this being handled gracefully in the middleware. There are cleaner solutions. But this is the solution that is the easiest to apply without lots of work and risk of breaking things (handling the logged in middleware before initializing the controller etc). Signed-off-by: Roeland Jago Douma --- core/Controller/PreviewController.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php index 3dfc4872d0..c25d917831 100644 --- a/core/Controller/PreviewController.php +++ b/core/Controller/PreviewController.php @@ -48,9 +48,6 @@ class PreviewController extends Controller { /** @var IPreview */ private $preview; - /** @var ITimeFactory */ - private $timeFactory; - /** * PreviewController constructor. * @@ -65,15 +62,13 @@ class PreviewController extends Controller { IRequest $request, IPreview $preview, IRootFolder $root, - string $userId, - ITimeFactory $timeFactory + ?string $userId ) { parent::__construct($appName, $request); $this->preview = $preview; $this->root = $root; $this->userId = $userId; - $this->timeFactory = $timeFactory; } /**