diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-12-03 09:09:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 09:09:09 +0100 |
| commit | c4d29cc3f155e4a0bb318a0cddc7b5997fc427b9 (patch) | |
| tree | f3945a98f4908699e882cba753d273590c2e1f99 | |
| parent | 769f4daece425cde82dcb063f41e7dae1d6a87d1 (diff) | |
| parent | 3b9a432136e9531b42b7502d4ef194ede4fdcc66 (diff) | |
| download | nextcloud-server-c4d29cc3f155e4a0bb318a0cddc7b5997fc427b9.tar.gz nextcloud-server-c4d29cc3f155e4a0bb318a0cddc7b5997fc427b9.zip | |
Merge pull request #24514 from nextcloud/backport/24501/stable19
[stable19] set mountid for personal external storage mounts
| -rw-r--r-- | apps/files_external/lib/Config/ConfigAdapter.php | 3 | ||||
| -rw-r--r-- | apps/files_external/lib/Lib/PersonalMount.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php index fa33f3de793..d246bb05fc1 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -167,7 +167,8 @@ class ConfigAdapter implements IMountProvider { '/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(), null, $loader, - $storageConfig->getMountOptions() + $storageConfig->getMountOptions(), + $storageConfig->getId() ); } else { return new ExternalMountPoint( diff --git a/apps/files_external/lib/Lib/PersonalMount.php b/apps/files_external/lib/Lib/PersonalMount.php index 37a6661601c..8f3a127632e 100644 --- a/apps/files_external/lib/Lib/PersonalMount.php +++ b/apps/files_external/lib/Lib/PersonalMount.php @@ -55,9 +55,10 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { $mountpoint, $arguments = null, $loader = null, - $mountOptions = null + $mountOptions = null, + $mountId = null ) { - parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions); + parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions, $mountId); $this->storagesService = $storagesService; $this->numericStorageId = $storageId; } |