diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-02 19:48:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 19:48:05 +0100 |
| commit | 82cc9c1382ccdf4739e158346c487b69012d85e2 (patch) | |
| tree | 9976e75c75b4ee7c10ffe211cdfa1217ad80bbb6 /apps | |
| parent | 4deff37a3cd375a801d82b41663e2305c1d1c149 (diff) | |
| parent | 8d962579db3f2e38a6e6780f47c454a0168a31d3 (diff) | |
| download | nextcloud-server-82cc9c1382ccdf4739e158346c487b69012d85e2.tar.gz nextcloud-server-82cc9c1382ccdf4739e158346c487b69012d85e2.zip | |
Merge pull request #24501 from nextcloud/personal-external-mount-id
set mountid for personal external storage mounts
Diffstat (limited to 'apps')
| -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 a1266c647bb..a43d13d3e7f 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -166,7 +166,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; } |