diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-05-17 19:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 19:04:36 +0200 |
| commit | dfd4f5880ced75ba489f9d1b0ba91e6a1279d257 (patch) | |
| tree | 75f80fcc45722ded9ebfa92807c3d6ec0eca80af | |
| parent | 7c6b47dd27bbd5e477034f94b5111a687bbc2bbd (diff) | |
| parent | 3a56082ec54cf52bd3280331fed2b5844e1d1ad9 (diff) | |
| download | nextcloud-server-dfd4f5880ced75ba489f9d1b0ba91e6a1279d257.tar.gz nextcloud-server-dfd4f5880ced75ba489f9d1b0ba91e6a1279d257.zip | |
Merge pull request #38317 from nextcloud/backport/38115/stable26
[stable26] Rename `numericStorageId` to `numericExternalStorageId` in PersonalMount.php
| -rw-r--r-- | apps/files_external/lib/Lib/PersonalMount.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_external/lib/Lib/PersonalMount.php b/apps/files_external/lib/Lib/PersonalMount.php index b22266fce18..b0487494635 100644 --- a/apps/files_external/lib/Lib/PersonalMount.php +++ b/apps/files_external/lib/Lib/PersonalMount.php @@ -36,8 +36,8 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { /** @var UserStoragesService */ protected $storagesService; - /** @var int */ - protected $numericStorageId; + /** @var int id of the external storage (mount) (not the numeric id of the resulting storage!) */ + protected $numericExternalStorageId; /** * @param UserStoragesService $storagesService @@ -51,7 +51,7 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { public function __construct( UserStoragesService $storagesService, StorageConfig $storageConfig, - $storageId, + $externalStorageId, $storage, $mountpoint, $arguments = null, @@ -61,7 +61,7 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { ) { parent::__construct($storageConfig, $storage, $mountpoint, $arguments, $loader, $mountOptions, $mountId); $this->storagesService = $storagesService; - $this->numericStorageId = $storageId; + $this->numericExternalStorageId = $externalStorageId; } /** @@ -71,7 +71,7 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { * @return bool */ public function moveMount($target) { - $storage = $this->storagesService->getStorage($this->numericStorageId); + $storage = $this->storagesService->getStorage($this->numericExternalStorageId); // remove "/$user/files" prefix $targetParts = explode('/', trim($target, '/'), 3); $storage->setMountPoint($targetParts[2]); @@ -86,7 +86,7 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount { * @return bool */ public function removeMount() { - $this->storagesService->removeStorage($this->numericStorageId); + $this->storagesService->removeStorage($this->numericExternalStorageId); return true; } } |