From cfd5934545135fc8b06004b0b39febfe7b98dd53 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Sun, 2 Apr 2023 13:28:19 -0400 Subject: [PATCH] fix file on case search by id and broken pagination --- api/v3/Generic/Getlist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v3/Generic/Getlist.php b/api/v3/Generic/Getlist.php index ec0fb38877..53aa4526e2 100644 --- a/api/v3/Generic/Getlist.php +++ b/api/v3/Generic/Getlist.php @@ -41,7 +41,7 @@ function civicrm_api3_generic_getList($apiRequest) { $searchResult = _civicrm_api3_generic_getlist_get_result($request, $entity, $meta, $apiRequest); $foundIDCount = 0; - if ($forceIdSearch && !empty($result['values'])) { + if ($forceIdSearch && !empty($result['values']) && isset($idRequest['id'])) { $contactSearchID = $idRequest['id']; $foundIDCount = 1; // Merge id fetch into search result. @@ -205,7 +205,7 @@ function _civicrm_api3_generic_getList_defaults(string $entity, array &$request, // Adding one extra result allows us to see if there are any more 'limit' => $resultsPerPage + 1, // Because sql is zero-based - 'offset' => ($request['page_num'] - 1) * $resultsPerPage, + 'offset' => ($request['page_num'] > 1) ? (($request['page_num'] - 1) * $resultsPerPage) : 0, ]; } } -- 2.25.1