diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-22 17:44:34 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-22 17:44:34 -0400 |
| commit | 6bf60ac5cb897511fe48dc2d28ddb3d02a44c410 (patch) | |
| tree | 1bd10a972a0dfc5997def5d376ecc478c97130db /phpBB/viewonline.php | |
| parent | b3fdf8a0463438e1e86979a5a4e50611228aea52 (diff) | |
| parent | b0bfe724fbb7cb69fa8eed2643bebe44c60482ad (diff) | |
| download | forums-6bf60ac5cb897511fe48dc2d28ddb3d02a44c410.tar forums-6bf60ac5cb897511fe48dc2d28ddb3d02a44c410.tar.gz forums-6bf60ac5cb897511fe48dc2d28ddb3d02a44c410.tar.bz2 forums-6bf60ac5cb897511fe48dc2d28ddb3d02a44c410.tar.xz forums-6bf60ac5cb897511fe48dc2d28ddb3d02a44c410.zip | |
Merge PR #971 branch 'nickvergessen/ticket/11018' into develop
* nickvergessen/ticket/11018:
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
[ticket/11014] Fix text for previous/next links in Subsilver2
[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
[ticket/11018] Always display previous/next links if we can display one
[ticket/11014] Restore template vars for next/previous links
[ticket/11018] Swap prev/next links on pagination to the old order
[ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
[ticket/11018] Fix minor issues with CSS in prosilver
[ticket/11018] Attempt to fix li.pagination alignment issue
Diffstat (limited to 'phpBB/viewonline.php')
| -rw-r--r-- | phpBB/viewonline.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 15884a41d8..687fef4c6c 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -422,7 +422,6 @@ $template->assign_vars(array( 'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)), 'TOTAL_GUEST_USERS_ONLINE' => $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter), 'LEGEND' => $legend, - 'PAGINATION' => $pagination, 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $counter, $config['topics_per_page'], $start), 'U_SORT_USERNAME' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), |