adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

enhancement to paginator

Browse source 
As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid
This commit is contained in:
Toby Cox 2014-04-17 10:03:08 +01:00 committed by mark_story
parent 296ea215b1
commit 823f01601d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Controller/Component/PaginatorComponent.php
View file

@ -202,8 +202,8 @@ class PaginatorComponent extends Component {
$count = 0; $count = 0;
} elseif ($object->hasMethod('paginateCount')) { } elseif ($object->hasMethod('paginateCount')) {
$count = $object->paginateCount($conditions, $recursive, $extra); $count = $object->paginateCount($conditions, $recursive, $extra);
} elseif (count($results)<$limit) { } elseif (count($results) < $limit && $page==1) {
$count = count($results); // no point in finding the count if it's less than our limit $count = count($results); // no point in finding the count if it's less than our limit and we're on the first page
} else { } else {
$parameters = compact('conditions'); $parameters = compact('conditions');
if ($recursive != $object->recursive) { if ($recursive != $object->recursive) {