From 4bcb7d88b5cbb8d2c83176062dc76c6213a13c48 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 28 Mar 2017 10:51:44 +0200 Subject: Return the token as well Signed-off-by: Joas Schilling --- lib/private/Encryption/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/Encryption/File.php') diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php index a1fd8e300d4..f6fd3382cb5 100644 --- a/lib/private/Encryption/File.php +++ b/lib/private/Encryption/File.php @@ -94,7 +94,7 @@ class File implements \OCP\Encryption\IFile { $resultForParents = $this->shareManager->getAccessList($parentNode); $this->cache[$parent] = $resultForParents; } - $userIds = \array_merge($userIds, $resultForParents['users']); + $userIds = array_merge($userIds, $resultForParents['users']); $public = $resultForParents['public'] || !empty($resultForParents['remote']); -- cgit v1.2.3