ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3960 from nextcloud/backport/3952/stable23

Browse Source
This commit is contained in:
Julius Härtl
2022-08-08 09:32:35 +02:00
committed by GitHub
parent b686cae095 c46ca8a03a
commit 7a5c745bdf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Service/ConfigService.php
View File

@@ -169,11 +169,11 @@ class ConfigService {
return array_filter($groups); return array_filter($groups);
} }
public function getAttachmentFolder(): string { public function getAttachmentFolder(string $userId = null): string {
if ($this->getUserId() === null) { if ($this->getUserId() === null) {
throw new NoPermissionException('Must be logged in get the attachment folder'); throw new NoPermissionException('Must be logged in get the attachment folder');
} }
return $this->config->getUserValue($this->getUserId(), 'deck', 'attachment_folder', '/Deck'); return $this->config->getUserValue($userId ?? $this->getUserId(), 'deck', 'attachment_folder', '/Deck');
} }
} }

2
lib/Sharing/Listener.php
View File

@@ -102,7 +102,7 @@ class Listener {
} }
} }
$parent = $this->configService->getAttachmentFolder(); $parent = $this->configService->getAttachmentFolder($userId);
$event->setParent($parent); $event->setParent($parent);
if (!$event->getView()->is_dir($parent)) { if (!$event->getView()->is_dir($parent)) {
$event->getView()->mkdir($parent); $event->getView()->mkdir($parent);