diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-15 20:18:04 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-04-23 12:54:26 +0200 |
| commit | fb88aba8f4927b3175df34a2a499978a3b4c1b6b (patch) | |
| tree | f05caeb3b23835730509102d5975312c425ec7a5 /apps/files_sharing/lib/cache.php | |
| parent | d468cdacf27acf1de78a7b2f07d21d1851aa8f39 (diff) | |
| download | nextcloud-server-fb88aba8f4927b3175df34a2a499978a3b4c1b6b.tar.gz nextcloud-server-fb88aba8f4927b3175df34a2a499978a3b4c1b6b.zip | |
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
Diffstat (limited to 'apps/files_sharing/lib/cache.php')
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 3d9fbcf4de9..4b473c60577 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -141,15 +141,14 @@ class Shared_Cache extends Cache { $folder = ''; } - $dir = 'files' . $this->storage->getMountPoint(); - $dir .= ($folder !== '') ? '/' . $folder : ''; + $dir = ($folder !== '') ? $folder . '/' : ''; $cache = $this->getSourceCache($folder); if ($cache) { $parent = $this->storage->getFile($folder); $sourceFolderContent = $cache->getFolderContents($this->files[$folder]); foreach ($sourceFolderContent as $key => $c) { - $sourceFolderContent[$key]['path'] = $dir . '/' . $c['name']; + $sourceFolderContent[$key]['path'] = $dir . $c['name']; $sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner']; $sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner']; } |