aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-07-26 17:37:11 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2019-07-26 17:37:11 +0200
commita2a53848b02da402382b3af2183d1e78554ba9f7 (patch)
tree2a441d4bc0aa326e5f1bdbfecd0999b5cd4aabec
parent4986241873ff92a7763ba1b7b5c436a3dbb189ed (diff)
downloadnextcloud-server-a2a53848b02da402382b3af2183d1e78554ba9f7.tar.gz
nextcloud-server-a2a53848b02da402382b3af2183d1e78554ba9f7.zip
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 <roeland@famdouma.nl>
-rw-r--r--core/Controller/PreviewController.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index 3dfc4872d01..c25d9178310 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;
}
/**