diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-14 16:30:41 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-14 16:30:41 -0700 |
| commit | 24bbd06d49a5d80fccfe37e98fd7786d4bda2807 (patch) | |
| tree | e8efa26e6c9a26bf59af33dcc79ec5e169e5dfad /phpBB/phpbb | |
| parent | d310ffc26cd592cb07148daf6e5a36c4b12c6657 (diff) | |
| parent | f6ee0152edff08023c33c2ecb49a0251d2926408 (diff) | |
| download | forums-24bbd06d49a5d80fccfe37e98fd7786d4bda2807.tar forums-24bbd06d49a5d80fccfe37e98fd7786d4bda2807.tar.gz forums-24bbd06d49a5d80fccfe37e98fd7786d4bda2807.tar.bz2 forums-24bbd06d49a5d80fccfe37e98fd7786d4bda2807.tar.xz forums-24bbd06d49a5d80fccfe37e98fd7786d4bda2807.zip | |
Merge remote-tracking branch 'PayBas/ticket/12613' into develop-ascraeus
* PayBas/ticket/12613: (25 commits)
[ticket/12613] Add distinction between top/bottom action-bar
[ticket/12613] Replaced topic-actions with action-bar
[ticket/12613] Remove responsive linklist from memberlist
[ticket/12613] Remove unnecessary checks and clean up CSS
[ticket/12613] role="navigation" not allowed on <ul>
[ticket/12613] Improved screen reader functionality
[ticket/12613] Removed unnecessary checks
[ticket/12613] Set fixed font-size
[ticket/12613] Slightly better icons
[ticket/12613] Typo and L_COLON
[ticket/12613] Small inconsistency fixes
[ticket/12613] Don't display page-jump if all pages are visible (6)
[ticket/12613] Fixes from comments (single quotes and typos)
[ticket/12613] Minor $bull; and <hr> fix
[ticket/12613] Pagination should never be in responsive linklist
[ticket/12613] Minor CSS fixes
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
[ticket/12613] Renamed jump-to to page-jump to prevent confusion
[ticket/12613] Removed form in order to prevent nested forms
[ticket/12613] Fix functional test and post sorting bug
...
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/pagination.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php index 927d711f4b..1d20b7f81c 100644 --- a/phpBB/phpbb/pagination.php +++ b/phpBB/phpbb/pagination.php @@ -126,8 +126,8 @@ class pagination // determine this number. Again at most five pages? Then just display them all. More than // five and we first (min) determine whether we'd end up listing more pages than exist. // We then (max) ensure we're displaying the minimum number of pages. - $start_page = ($total_pages > 5) ? min(max(1, $on_page - 3), $total_pages - 4) : 1; - $end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages; + $start_page = ($total_pages > 5) ? min(max(1, $on_page - 2), $total_pages - 4) : 1; + $end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 2), 5) : $total_pages; } if ($on_page != 1) |