mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24501 from nextcloud/personal-external-mount-id 

set mountid for personal external storage mounts
This commit is contained in:
Roeland Jago Douma 2020-12-02 19:48:05 +01:00 committed by GitHub
parent 4deff37a3c 8d962579db
commit 82cc9c1382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_external/lib/Config/ConfigAdapter.php
View File

@ -166,7 +166,8 @@ class ConfigAdapter implements IMountProvider {
'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(), '/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
null, null,
$loader, $loader,
$storageConfig->getMountOptions() $storageConfig->getMountOptions(),
$storageConfig->getId()
); );
} else { } else {
return new ExternalMountPoint( return new ExternalMountPoint(

5
apps/files_external/lib/Lib/PersonalMount.php
View File

@ -55,9 +55,10 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount {
$mountpoint, $mountpoint,
$arguments = null, $arguments = null,
$loader = 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->storagesService = $storagesService;
$this->numericStorageId = $storageId; $this->numericStorageId = $storageId;
} }