diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-29 15:49:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-06-29 15:49:23 +0200 |
| commit | 8233c3e340a3608a6952ef444143a10e668d6561 (patch) | |
| tree | a08e14baf9b7bb0304bdba5ca2eea10a0e453d1d /phpBB/includes | |
| parent | c0c4ce8b8b523b90314502ded4c7c0b85e150a63 (diff) | |
| parent | 91e773a79538a8fa26bea1d56384379b8730ac70 (diff) | |
| download | forums-8233c3e340a3608a6952ef444143a10e668d6561.tar forums-8233c3e340a3608a6952ef444143a10e668d6561.tar.gz forums-8233c3e340a3608a6952ef444143a10e668d6561.tar.bz2 forums-8233c3e340a3608a6952ef444143a10e668d6561.tar.xz forums-8233c3e340a3608a6952ef444143a10e668d6561.zip | |
Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop
* dhruvgoel92/ticket/9341:
[ticket/9341] Assert that page doesnt contain next or prev page posts
[ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
[ticket/9341] remove PREV_PAGE tpl var used for backward compatability
[ticket/9341] Add tests for checking Next and Previous template vars
[ticket/9341] Move create_topic and post into functional test case
[ticket/9341] Use U_PREVIOUS and U_NEXT in template files
[ticket/9341] Correctly named template vars
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b087e1298b..6a1b3fd4f8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2345,9 +2345,8 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $tpl_prefix . 'BASE_URL' => $base_url, 'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url), $tpl_prefix . 'PER_PAGE' => $per_page, - $tpl_prefix . 'PREVIOUS_PAGE' => $previous_page, - $tpl_prefix . 'PREV_PAGE' => $previous_page, - $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '', + 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => $previous_page, + 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '', $tpl_prefix . 'TOTAL_PAGES' => $total_pages, $tpl_prefix . 'CURRENT_PAGE' => $on_page, ); |