tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4' into 3.4.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-12-19 16:17:44 +00:00
commit c794c29ddb
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/PaginatedList.php
View File

@ -293,6 +293,7 @@ class PaginatedList extends SS_ListDecorator {
} }
$left = max($current - $offset, 1); $left = max($current - $offset, 1);
$right = min($current + $offset, $total);
$range = range($current - $offset, $current + $offset); $range = range($current - $offset, $current + $offset);
if ($left + $context > $total) { if ($left + $context > $total) {
@ -304,7 +305,7 @@ class PaginatedList extends SS_ListDecorator {
$num = $i + 1; $num = $i + 1;
$emptyRange = $num != 1 && $num != $total && ( $emptyRange = $num != 1 && $num != $total && (
$num == $left - 1 || $num == $left + $context + 1 $num == $left - 1 || $num == $right + 1
); );
if ($emptyRange) { if ($emptyRange) {