diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-25 13:20:45 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2012-10-17 23:33:18 +0200 |
commit | fa5753de707e0b24c686cf75a7ae9d261bc2a8f2 (patch) | |
tree | 2081e55513387da7a4c407141c236015faf343c6 /phpBB/includes | |
parent | 43a713ea8356221eb199c5aba066efa15013c186 (diff) | |
download | forums-fa5753de707e0b24c686cf75a7ae9d261bc2a8f2.tar forums-fa5753de707e0b24c686cf75a7ae9d261bc2a8f2.tar.gz forums-fa5753de707e0b24c686cf75a7ae9d261bc2a8f2.tar.bz2 forums-fa5753de707e0b24c686cf75a7ae9d261bc2a8f2.tar.xz forums-fa5753de707e0b24c686cf75a7ae9d261bc2a8f2.zip |
[ticket/11018] Swap prev/next links on pagination to the old order
In the old pagination Prev was left of the pagination and Next right of the
pagination. While moving these blocks, I also removed the whitespaces, which
were introduced.
PHPBB3-11023
PHPBB3-11018
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0c9421c12f..08dd03504c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2112,14 +2112,14 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages; } - if ($on_page != $total_pages) + if ($on_page != 1) { $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page), + 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page), 'S_IS_CURRENT' => false, - 'S_IS_PREV' => false, - 'S_IS_NEXT' => true, + 'S_IS_PREV' => true, + 'S_IS_NEXT' => false, 'S_IS_ELLIPSIS' => false, )); } @@ -2166,14 +2166,14 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam } while ($at_page <= $total_pages); - if ($on_page != 1) + if ($on_page != $total_pages) { $template->assign_block_vars($block_var_name, array( 'PAGE_NUMBER' => '', - 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . (($on_page - 2) * $per_page), + 'PAGE_URL' => $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page), 'S_IS_CURRENT' => false, - 'S_IS_PREV' => true, - 'S_IS_NEXT' => false, + 'S_IS_PREV' => false, + 'S_IS_NEXT' => true, 'S_IS_ELLIPSIS' => false, )); } |