diff options
| author | Simon L <szaimen@e.mail.de> | 2023-05-16 19:08:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 19:08:39 +0200 |
| commit | fa4d153610065d003ddbc6b90bf99e44c845ad07 (patch) | |
| tree | b0d125f6a580bd35f6114ba78cd27b0a68b7aca1 /apps | |
| parent | dc1b68c59d0f114cf20562b2279e7d1c22ca79bc (diff) | |
| parent | 55d7add92fc941fe4d744cc729afb526d77235bd (diff) | |
| download | nextcloud-server-fa4d153610065d003ddbc6b90bf99e44c845ad07.tar.gz nextcloud-server-fa4d153610065d003ddbc6b90bf99e44c845ad07.zip | |
Merge pull request #38115 from DerGenaue/patch-1
Rename `numericStorageId` to `numericExternalStorageId` in PersonalMount.php
Diffstat (limited to 'apps')
| -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; } } |