makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/mcp/mcp_forum.php
View file

@ -98,9 +98,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
$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'],
@ -460,4 +457,4 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
}
}
?>
?>

2
phpBB/includes/mcp/mcp_main.php
View file

@ -1336,4 +1336,4 @@ function mcp_fork_topic($topic_ids)
}
}
?>
?>

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)
}
}
?>
?>