Merge pull request #10322 from nextcloud/backport/10321/stable3.7

[stable3.7] fix(contactsintegration): Limit number of search results
nextcloud · Nov 19, 2024 · 4edca0d · 4edca0d
2 parents b135c01 + a379619
commit 4edca0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-stable29', 'dev-stable28', 'dev-stable27' ]
+        ocp-version: [ 'dev-stable30', 'dev-stable29', 'dev-stable28', 'dev-stable27' ]
 
     name: static-psalm-analysis ${{ matrix.ocp-version }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1', '8.2', '8.3']
-        nextcloud-versions: ['stable29']
+        nextcloud-versions: ['stable30']
         include:
           - php-versions: '8.0'
             nextcloud-versions: 'stable27'
@@ -60,7 +60,7 @@ jobs:
       strategy:
           matrix:
               php-versions: ['8.3']
-              nextcloud-versions: ['stable29']
+              nextcloud-versions: ['stable30']
               db: ['sqlite', 'mysql', 'pgsql']
               cache: ['nocache']
               include:

diff --git a/lib/Service/ContactsIntegration.php b/lib/Service/ContactsIntegration.php
@@ -241,7 +241,8 @@ private function doSearch(string $term, array $fields, bool $strictSearch): arra
 		$allowSystemUsers = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'no') === 'yes';
 
 		$result = $this->contactsManager->search($term, $fields, [
-			'strict_search' => $strictSearch
+			'strict_search' => $strictSearch,
+			'limit' => 20,
 		]);
 		$matches = [];
 		foreach ($result as $r) {