summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-09 10:05:36 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-09 10:05:36 +0100
commit51b5498be8b5b29d28922563f301362d936f3be5 (patch)
treeb395ac0ca78386a93a6895d061399c2713f940e8 /apps/files_external/lib
parentbb8dbc291b710fd044d3ac4a04233cb1ab6dc7c9 (diff)
parent8c1afb8fb9206e04ce03e8927170a8469cce6c51 (diff)
downloadnextcloud-server-51b5498be8b5b29d28922563f301362d936f3be5.tar.gz
nextcloud-server-51b5498be8b5b29d28922563f301362d936f3be5.zip
Merge pull request #21003 from owncloud/personal-mount-mountid
Dont set the string storage id to the numeric storage id for personal mounts
Diffstat (limited to 'apps/files_external/lib')
-rw-r--r--apps/files_external/lib/personalmount.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php
index 26f68ba32db..f81dee5be1e 100644
--- a/apps/files_external/lib/personalmount.php
+++ b/apps/files_external/lib/personalmount.php
@@ -35,7 +35,7 @@ class PersonalMount extends MountPoint implements MoveableMount {
protected $storagesService;
/** @var int */
- protected $storageId;
+ protected $numericStorageId;
/**
* @param UserStoragesService $storagesService
@@ -57,7 +57,7 @@ class PersonalMount extends MountPoint implements MoveableMount {
) {
parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
$this->storagesService = $storagesService;
- $this->storageId = $storageId;
+ $this->numericStorageId = $storageId;
}
/**
@@ -67,7 +67,7 @@ class PersonalMount extends MountPoint implements MoveableMount {
* @return bool
*/
public function moveMount($target) {
- $storage = $this->storagesService->getStorage($this->storageId);
+ $storage = $this->storagesService->getStorage($this->numericStorageId);
// remove "/$user/files" prefix
$targetParts = explode('/', trim($target, '/'), 3);
$storage->setMountPoint($targetParts[2]);
@@ -82,7 +82,7 @@ class PersonalMount extends MountPoint implements MoveableMount {
* @return bool
*/
public function removeMount() {
- $this->storagesService->removeStorage($this->storageId);
+ $this->storagesService->removeStorage($this->numericStorageId);
return true;
}
}