diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-06 22:51:18 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-26 23:10:23 +0200 |
| commit | c55583d1b43d1cc72e831a8ff113bd8c60b1a6d3 (patch) | |
| tree | e461ba68ba26d9d925cb5a07ddba51d05339b51c /apps | |
| parent | f7713e5f3f14db6f15eeec2aba7cbbdcb70830ab (diff) | |
| download | nextcloud-server-c55583d1b43d1cc72e831a8ff113bd8c60b1a6d3.tar.gz nextcloud-server-c55583d1b43d1cc72e831a8ff113bd8c60b1a6d3.zip | |
allow more than one plugin per share type
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareesAPIController.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index 9e714226d29..45c1b5e6dcf 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -198,6 +198,8 @@ class ShareesAPIController extends OCSController { list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset); + // extra treatment for 'exact' subarray, with a single merge expected keys might be lost + $result['exact'] = array_merge($this->result['exact'], $result['exact']); $this->result = array_merge($this->result, $result); $response = new DataResponse($this->result); |