mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

[ticket/8610] Revert some funky merging I did from rebase

Browse Source 
PHPBB3-8610
This commit is contained in:
Nathan Guse
2012-12-13 20:30:16 -06:00
parent 71bcc58fee
commit 5c614ff624
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/mcp/mcp_topic.php
View File

@@ -307,12 +307,6 @@ function mcp_topic_view($id, $mode, $action)
'post_ids' => $post_id_list,
));
$base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&t={$topic_info['topic_id']}&mode=$mode&action=$action&to_topic_id=$to_topic_id&posts_per_page=$posts_per_page&st=$sort_days&sk=$sort_key&sd=$sort_dir");
if ($posts_per_page)
{
phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $posts_per_page, $start);
}
$template->assign_vars(array(
'TOPIC_TITLE' => $topic_info['topic_title'],
'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_info['forum_id'] . '&t=' . $topic_info['topic_id']),
@@ -712,4 +706,4 @@ function merge_posts($topic_id, $to_topic_id)
}
}
?>
?>