[Pkg-owncloud-commits] [owncloud] 46/107: Dont set the string storage id to the numeric storage id for personal mounts

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b5a7408193126b15d41889e73396330132fb068b
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon Dec 7 16:15:37 2015 +0100

    Dont set the string storage id to the numeric storage id for personal mounts
---
 apps/files_external/lib/personalmount.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php
index 26f68ba..f81dee5 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;
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git