From 7a454135591b64a69c3eab2c5646c104e8df1b8c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 28 Nov 2019 10:48:06 +0100 Subject: [PATCH] Always do sharee lookup on lookup server in GS Signed-off-by: Roeland Jago Douma --- .../lib/Controller/ShareesAPIController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index e750235470..7bc772f3bf 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -207,6 +207,14 @@ class ShareesAPIController extends OCSController { $this->limit = (int) $perPage; $this->offset = $perPage * ($page - 1); + // In global scale mode we always search the loogup server + if ($this->config->getSystemValueBool('gs.enabled', false)) { + $lookup = true; + $this->result['lookupEnabled'] = true; + } else { + $this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes'; + } + 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 @@ -214,7 +222,6 @@ class ShareesAPIController extends OCSController { $result['exact'] = array_merge($this->result['exact'], $result['exact']); } $this->result = array_merge($this->result, $result); - $this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes'; $response = new DataResponse($this->result); if ($hasMoreResults) {