Skip to content

Commit

Permalink
Rename numericStorageId to numericExternalStorageId in PersonalMo…
Browse files Browse the repository at this point in the history
…unt.php

so that it doesn't override `numericStorageId` in the `MountPoint` baseclass

fixes nextcloud#37473
fixes nextcloud#37414

Signed-off-by: Daniel <7558512+DerGenaue@users.noreply.github.com>
  • Loading branch information
DerGenaue authored May 7, 2023
1 parent b3ab885 commit 55d7add
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions apps/files_external/lib/Lib/PersonalMount.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -51,7 +51,7 @@ class PersonalMount extends ExternalMountPoint implements MoveableMount {
public function __construct(
UserStoragesService $storagesService,
StorageConfig $storageConfig,
$storageId,
$externalStorageId,
$storage,
$mountpoint,
$arguments = null,
Expand All @@ -61,7 +61,7 @@ public function __construct(
) {
parent::__construct($storageConfig, $storage, $mountpoint, $arguments, $loader, $mountOptions, $mountId);
$this->storagesService = $storagesService;
$this->numericStorageId = $storageId;
$this->numericExternalStorageId = $externalStorageId;
}

/**
Expand All @@ -71,7 +71,7 @@ public function __construct(
* @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]);
Expand All @@ -86,7 +86,7 @@ public function moveMount($target) {
* @return bool
*/
public function removeMount() {
$this->storagesService->removeStorage($this->numericStorageId);
$this->storagesService->removeStorage($this->numericExternalStorageId);
return true;
}
}

0 comments on commit 55d7add

Please sign in to comment.