diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-07 13:19:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-07 13:19:59 +0000 |
| commit | 5de26540b4f0348719ec93e760ed987f92a60075 (patch) | |
| tree | c3404563a65d5ed2699257ee82d723fb39b28cfe /phpBB/includes/functions.php | |
| parent | 8678ad0b0b2f83ce91047f06fb73474105a70d7c (diff) | |
| download | forums-5de26540b4f0348719ec93e760ed987f92a60075.tar forums-5de26540b4f0348719ec93e760ed987f92a60075.tar.gz forums-5de26540b4f0348719ec93e760ed987f92a60075.tar.bz2 forums-5de26540b4f0348719ec93e760ed987f92a60075.tar.xz forums-5de26540b4f0348719ec93e760ed987f92a60075.zip | |
fixing some bugs
changed the way we are handling bookmarks. No order_id required, really! Order by last post time as suggested by BartVB.
git-svn-id: file:///svn/phpbb/trunk@7497 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 78a9983b0f..41023816af 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1455,6 +1455,8 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } $on_page = floor($start_item / $per_page) + 1; + $url_delim = (strpos($base_url, '?') === false) ? '?' : '&'; + $page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>'; if ($total_pages > 5) @@ -1466,7 +1468,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add for ($i = $start_cnt + 1; $i < $end_cnt; $i++) { - $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "&start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; + $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; if ($i < $end_cnt - 1) { $page_string .= $seperator; @@ -1481,7 +1483,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add for ($i = 2; $i < $total_pages; $i++) { - $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "&start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; + $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; if ($i < $total_pages) { $page_string .= $seperator; @@ -1489,18 +1491,18 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } } - $page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . $base_url . '&start=' . (($total_pages - 1) * $per_page) . '">' . $total_pages . '</a>'; + $page_string .= ($on_page == $total_pages) ? '<strong>' . $total_pages . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($total_pages - 1) * $per_page) . '">' . $total_pages . '</a>'; if ($add_prevnext_text) { if ($on_page != 1) { - $page_string = '<a href="' . $base_url . '&start=' . (($on_page - 2) * $per_page) . '">' . $user->lang['PREVIOUS'] . '</a> ' . $page_string; + $page_string = '<a href="' . $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page) . '">' . $user->lang['PREVIOUS'] . '</a> ' . $page_string; } if ($on_page != $total_pages) { - $page_string .= ' <a href="' . $base_url . '&start=' . ($on_page * $per_page) . '">' . $user->lang['NEXT'] . '</a>'; + $page_string .= ' <a href="' . $base_url . "{$url_delim}start=" . ($on_page * $per_page) . '">' . $user->lang['NEXT'] . '</a>'; } } @@ -1508,8 +1510,8 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add $tpl_prefix . 'BASE_URL' => $base_url, $tpl_prefix . 'PER_PAGE' => $per_page, - $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 1) ? '' : $base_url . '&start=' . (($on_page - 2) * $per_page), - $tpl_prefix . 'NEXT_PAGE' => ($on_page == $total_pages) ? '' : $base_url . '&start=' . ($on_page * $per_page), + $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page), + $tpl_prefix . 'NEXT_PAGE' => ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page), $tpl_prefix . 'TOTAL_PAGES' => $total_pages) ); |