aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-29 17:54:04 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-29 17:54:04 +0100
commitb1d8d88df85030bd8c539307fab11db131732558 (patch)
treec22ff1323da36ab7aba867b0cd64c2ac61f9e3e7 /apps/files_encryption/lib
parent5c8e5e223d07780196680732544fa66a5fa2503c (diff)
parent333f4e7913ff8085f46f80db5bf1224fb1cd6e0c (diff)
downloadnextcloud-server-b1d8d88df85030bd8c539307fab11db131732558.tar.gz
nextcloud-server-b1d8d88df85030bd8c539307fab11db131732558.zip
Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
make sure that we always create a public share key for remote shares
Diffstat (limited to 'apps/files_encryption/lib')
-rw-r--r--apps/files_encryption/lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b300999ff24..14d0a0bc4b9 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1109,7 +1109,7 @@ class Util {
// Find out who, if anyone, is sharing the file
$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner);
$userIds = \array_merge($userIds, $result['users']);
- if ($result['public']) {
+ if ($result['public'] || $result['remote']) {
$userIds[] = $this->publicShareKeyId;
}