Fixed issue with Contact Search and Hard limit and paging.

CHANGELOG.md

@@ -3,6 +3,7 @@
 * Regression fix dashlets not working anymore #122
 * Fixed contact Summary tab not loading due to fatal error. See !115 and #122
 * Performance improvements.
+* Fixed issue with Contact Search and Hard limit and paging.
 
 # Version 1.69
 

CRM/Dataprocessor/Form/Output/AbstractUIOutputForm.php

@@ -270,11 +270,18 @@ abstract class CRM_Dataprocessor_Form_Output_AbstractUIOutputForm extends CRM_Co
     $limit = static::getDefaultLimit($output);
     if (isset($submittedValues['crmRowCount']) && $submittedValues['crmRowCount']) {
       $limit = $submittedValues['crmRowCount'];
+    } elseif (CRM_Utils_Request::retrieve('crmRowCount', 'Integer')) {
+      $limit = CRM_Utils_Request::retrieve('crmRowCount', 'Integer');
+    }
+    $pageId = 1;
+    if (isset($submittedValues['crmPID'])) {
+      $pageId = $submittedValues['crmPID'];
+    } elseif (CRM_Utils_Request::retrieve('crmPID', 'Integer')) {
+      $pageId = CRM_Utils_Request::retrieve('crmPID', 'Integer');
     }
-    $pageId = isset($submittedValues['crmPID']) ?? 1;
     $offset = static::getOffset($pageId, $limit, $hardLimit);
-    if ($hardLimit && $limit > $hardLimit) {
-      $limit = $hardLimit;
+    if ($hardLimit && ($offset + $limit) > $hardLimit) {
+      $limit = $hardLimit - $offset;
     }
     try {
       $dataProcessor->getDataFlow()->setOffset($offset);