diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-01-05 02:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 02:44:57 +0100 |
| commit | 9cb74afbc48d587d406e316680c155686fca7ebd (patch) | |
| tree | c8aef6cbff4230e670289300f0098497f267e008 /lib/Config.php | |
| parent | c76b1978547f554038792b22c69730ab18be73c3 (diff) | |
| parent | 1fbef4bf5f5fd5126adbcb833dc8daaebdf8f250 (diff) | |
Merge pull request #8465 from nextcloud/add-app-config-for-default-attachment-location
Add app config to specify default attachment folder location
Diffstat (limited to 'lib/Config.php')
| -rw-r--r-- | lib/Config.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Config.php b/lib/Config.php index 9c9119271..14882d0ae 100644 --- a/lib/Config.php +++ b/lib/Config.php @@ -202,7 +202,8 @@ class Config { } public function getAttachmentFolder(string $userId): string { - return $this->config->getUserValue($userId, 'spreed', 'attachment_folder', '/Talk'); + $defaultAttachmentFolder = $this->config->getAppValue('spreed', 'default_attachment_folder', '/Talk'); + return $this->config->getUserValue($userId, 'spreed', 'attachment_folder', $defaultAttachmentFolder); } /** |