diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-14 11:33:10 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-23 12:54:25 +0200 |
| commit | 3f6e9e01026031527cd80f1f608d7a98d93e7ebe (patch) | |
| tree | 46b3f2b8ff1fb08f3671c33d98ee5d57c07eb196 /apps/files_sharing/lib/cache.php | |
| parent | 22e0a4b9a8835df4bfc88b478e694b0983cb1060 (diff) | |
| download | nextcloud-server-3f6e9e01026031527cd80f1f608d7a98d93e7ebe.tar.gz nextcloud-server-3f6e9e01026031527cd80f1f608d7a98d93e7ebe.zip | |
cleanup the shared storage, always keep the whole share resource
Diffstat (limited to 'apps/files_sharing/lib/cache.php')
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index bce22a74baf..7e44847e404 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -50,7 +50,7 @@ class Shared_Cache extends Cache { if ($target === false || $target === $this->storage->getMountPoint()) { $target = ''; } - $source = \OC_Share_Backend_File::getSource($target, $this->storage->getMountPoint(), $this->storage->getShareType()); + $source = \OC_Share_Backend_File::getSource($target, $this->storage->getMountPoint(), $this->storage->getItemType()); if (isset($source['path']) && isset($source['fileOwner'])) { \OC\Files\Filesystem::initMountPoints($source['fileOwner']); $mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']); @@ -86,7 +86,7 @@ class Shared_Cache extends Cache { public function get($file) { if (is_string($file)) { if ($cache = $this->getSourceCache($file)) { - $path = 'files/' . $this->storage->getMountPoint(); + $path = 'files' . $this->storage->getMountPoint(); $path .= ($file !== '') ? '/' . $file : ''; $data = $cache->get($this->files[$file]); $data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom()); @@ -141,7 +141,7 @@ class Shared_Cache extends Cache { $folder = ''; } - $dir = 'files/' . $this->storage->getMountPoint(); + $dir = 'files' . $this->storage->getMountPoint(); $dir .= ($folder !== '') ? '/' . $folder : ''; $cache = $this->getSourceCache($folder); @@ -226,7 +226,7 @@ class Shared_Cache extends Cache { */ public function move($source, $target) { if ($cache = $this->getSourceCache($source)) { - $file = \OC_Share_Backend_File::getSource($target, $this->storage->getMountPoint(), $this->storage->getShareType()); + $file = \OC_Share_Backend_File::getSource($target, $this->storage->getMountPoint(), $this->storage->getItemType()); if ($file && isset($file['path'])) { $cache->move($this->files[$source], $file['path']); } |