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/includes/mcp/mcp_forum.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/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 7b3bc82093..151677bcfe 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -103,7 +103,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $base_url = $url . "&i=$id&action=$action&mode=$mode&sd=$sort_dir&sk=$sort_key&st=$sort_days" . (($merge_select) ? $selected_ids : ''); phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $forum_topics, $topics_per_page, $start); - + $template->assign_vars(array( 'ACTION' => $action, 'FORUM_NAME' => $forum_info['forum_name'], |