upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge pull request #38115 from DerGenaue/patch-1

Browse source 
Rename `numericStorageId` to `numericExternalStorageId` in PersonalMount.php
This commit is contained in:
Simon L 2023-05-16 19:08:39 +02:00 committed by GitHub
commit fa4d153610
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files_external/lib/Lib/PersonalMount.php
View file

@ -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;
}
}