Merge pull request #24513 from nextcloud/backport/24501/stable20

[stable20] set mountid for personal external storage mounts
nextcloud · Dec 2, 2020 · 54ab2b9 · 54ab2b9
2 parents bdbb60a + 987cd0d
commit 54ab2b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php
@@ -166,7 +166,8 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 					'/' . $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
@@ -55,9 +55,10 @@ public function __construct(
 		$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;
 	}