Skip to content

Commit f936f1c

Browse files
committed
fix: undefined share for preview
Signed-off-by: Elizabeth Danzberger <lizzy7128@tutanota.de>
1 parent 99c0d2d commit f936f1c

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

lib/Listener/BeforeFetchPreviewListener.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,17 @@ public function handle(Event $event): void {
3939
$shareToken = $this->request->getParam('token');
4040

4141
try {
42-
$share = $shareToken ?
43-
// Get different share for public previews as the share from the node is only set for mounted shares
44-
$this->shareManager->getShareByToken($shareToken)
45-
// Get share for internal shares
46-
: $this->helper->getShareFromNode($event->getNode());
42+
// Get different share for public previews as the share from the node is only set for mounted shares
43+
$shareByToken = $shareToken ? $this->shareManager->getShareByToken($shareToken) : null;
44+
45+
// Get share for internal shares
46+
$shareFromNode = $this->helper->getShareFromNode($event->getNode());
4747
} catch (ShareNotFound) {
4848
}
4949

50+
// Do not leave as undefined if neither found
51+
$share = $shareByToken ?? $shareFromNode ?? null;
52+
5053
$userId = $this->userSession->getUser() ? $this->userSession->getUser()->getUID() : null;
5154
if ($this->permissionManager->shouldWatermark($event->getNode(), $userId, $share)) {
5255
throw new NotFoundException();

0 commit comments

Comments
 (0)