diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-24 13:39:37 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-24 13:39:37 +0200 |
| commit | 84d36df70b7bfb5e7cf79c7a089675d79943084d (patch) | |
| tree | 23a6a6c7a88a3d0402ff2d533ac051001c269b6d /apps/files_sharing/lib/cache.php | |
| parent | 6a4a474aa94202c0d675b86fab384f509b9522f6 (diff) | |
| download | nextcloud-server-84d36df70b7bfb5e7cf79c7a089675d79943084d.tar.gz nextcloud-server-84d36df70b7bfb5e7cf79c7a089675d79943084d.zip | |
make sure that we always return the correct permissions
Diffstat (limited to 'apps/files_sharing/lib/cache.php')
| -rw-r--r-- | apps/files_sharing/lib/cache.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 7a6b70d82b5..6bc9e131949 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -95,9 +95,9 @@ class Shared_Cache extends Cache { } $data['uid_owner'] = $this->storage->getOwner($file); if (isset($data['permissions'])) { - $data['permissions'] &= $this->storage->getPermissions(''); + $data['permissions'] &= $this->storage->getPermissions($file); } else { - $data['permissions'] = $this->storage->getPermissions(''); + $data['permissions'] = $this->storage->getPermissions($file); } return $data; } @@ -163,7 +163,7 @@ class Shared_Cache extends Cache { $sourceFolderContent[$key]['path'] = $dir . $c['name']; $sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner']; $sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner']; - $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions(''); + $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']); } return $sourceFolderContent; |