diff options
author | icewind1991 <icewind1991@gmail.com> | 2013-04-26 06:55:21 -0700 |
---|---|---|
committer | icewind1991 <icewind1991@gmail.com> | 2013-04-26 06:55:21 -0700 |
commit | 5474fea1f657b95f4007af6ef673862273f18e1c (patch) | |
tree | e4a86a03e66ead867df83b0f4267b936a2edeaec /apps | |
parent | d825669265f0296b4981a99e31a78fb514ac1146 (diff) | |
parent | 809b5f81f6ee448563462ae8f642fbb8a6a11499 (diff) | |
download | nextcloud-server-5474fea1f657b95f4007af6ef673862273f18e1c.tar.gz nextcloud-server-5474fea1f657b95f4007af6ef673862273f18e1c.zip |
Merge pull request #3136 from owncloud/mount-cleanup
Separation of mount management
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_sharing/lib/cache.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 9fccd0b46f3..733b7838760 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -44,7 +44,7 @@ class Shared_Cache extends Cache { $source = \OC_Share_Backend_File::getSource($target); if (isset($source['path']) && isset($source['fileOwner'])) { \OC\Files\Filesystem::initMountPoints($source['fileOwner']); - $mount = \OC\Files\Mount::findByNumericId($source['storage']); + $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']); if ($mount) { $fullPath = $mount->getMountPoint().$source['path']; list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index ffd4e5ced22..2facad0f7e2 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -71,7 +71,7 @@ class Shared extends \OC\Files\Storage\Common { if ($source) { if (!isset($source['fullPath'])) { \OC\Files\Filesystem::initMountPoints($source['fileOwner']); - $mount = \OC\Files\Mount::findByNumericId($source['storage']); + $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']); if ($mount) { $this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path']; } else { |