From c55583d1b43d1cc72e831a8ff113bd8c60b1a6d3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 6 Sep 2017 22:51:18 +0200 Subject: 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 --- apps/files_sharing/lib/Controller/ShareesAPIController.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apps') 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); -- cgit v1.2.3