summaryrefslogtreecommitdiffstats
path: root/lib/private/Encryption
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-27 16:06:31 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2017-04-13 12:58:50 +0200
commit91e650791de6dbb320e5163f626c754d42e0bc35 (patch)
treeb6860a90d3b22bfd715cd7ba444673ae72bebfc0 /lib/private/Encryption
parent0c2dc3bc8cdca46afc2bc08da4a985610093f2af (diff)
downloadnextcloud-server-91e650791de6dbb320e5163f626c754d42e0bc35.tar.gz
nextcloud-server-91e650791de6dbb320e5163f626c754d42e0bc35.zip
Return the paths for the users without setting them all up
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Encryption')
-rw-r--r--lib/private/Encryption/File.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php
index 3b6a87ef516..a1fd8e300d4 100644
--- a/lib/private/Encryption/File.php
+++ b/lib/private/Encryption/File.php
@@ -95,14 +95,14 @@ class File implements \OCP\Encryption\IFile {
$this->cache[$parent] = $resultForParents;
}
$userIds = \array_merge($userIds, $resultForParents['users']);
- $public = $resultForParents['public'] || $resultForParents['remote'];
+ $public = $resultForParents['public'] || !empty($resultForParents['remote']);
// Find out who, if anyone, is sharing the file
if ($file !== null) {
$resultForFile = $this->shareManager->getAccessList($file, false);
$userIds = array_merge($userIds, $resultForFile['users']);
- $public = $resultForFile['public'] || $resultForFile['remote'] || $public;
+ $public = $resultForFile['public'] || !empty($resultForFile['remote']) || $public;
}
// check if it is a group mount