diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-03-11 13:04:20 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-03-11 13:04:20 +0100 |
| commit | d55c7223a96e259543d28f53474a17525fdac25f (patch) | |
| tree | c2acd009ea815b0df04d608235a785990cea3f4d /apps/files_sharing/lib/cache.php | |
| parent | 06c6163265bf10e7aa84c2621d58323b3ad94963 (diff) | |
| parent | c1cb9ee9b0b19e17ddde046642fa01d52cda63bf (diff) | |
| download | nextcloud-server-d55c7223a96e259543d28f53474a17525fdac25f.tar.gz nextcloud-server-d55c7223a96e259543d28f53474a17525fdac25f.zip | |
Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
Diffstat (limited to 'apps/files_sharing/lib/cache.php')
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 579780dcd2b..01db29d72e2 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -137,9 +137,12 @@ class Shared_Cache extends Cache { } else { $cache = $this->getSourceCache($folder); if ($cache) { + $parent = $this->storage->getFile($folder); $sourceFolderContent = $cache->getFolderContents($this->files[$folder]); foreach ($sourceFolderContent as $key => $c) { $sourceFolderContent[$key]['usersPath'] = 'files/Shared/' . $folder . '/' . $c['name']; + $sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner']; + $sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner']; } return $sourceFolderContent; |