diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-03-28 10:51:44 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-04-13 12:58:51 +0200 |
| commit | 4bcb7d88b5cbb8d2c83176062dc76c6213a13c48 (patch) | |
| tree | c4e7f750cad011dabca80bb1900b9d251821df7c | |
| parent | cf7c3209490c60f03fc90b6a71d5d1e00a9d802e (diff) | |
| download | nextcloud-server-4bcb7d88b5cbb8d2c83176062dc76c6213a13c48.tar.gz nextcloud-server-4bcb7d88b5cbb8d2c83176062dc76c6213a13c48.zip | |
Return the token as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | apps/federatedfilesharing/lib/FederatedShareProvider.php | 3 | ||||
| -rw-r--r-- | lib/private/Encryption/File.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index 9e8d9fd9e47..bf50206a733 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -983,7 +983,7 @@ class FederatedShareProvider implements IShareProvider { } $qb = $this->dbConnection->getQueryBuilder(); - $qb->select('share_with', 'file_source', 'file_target') + $qb->select('share_with', 'token', 'file_source', 'file_target') ->from('share') ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_REMOTE))) ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))) @@ -998,6 +998,7 @@ class FederatedShareProvider implements IShareProvider { $remote[$row['share_with']] = [ 'node_id' => $row['file_source'], 'node_path' => $row['file_target'], + 'token' => $row['token'], ]; } $cursor->closeCursor(); 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']); |