Merge make the MCP remember a bit more - still far from perfect as pagination makes it forget

git-svn-id: file:///svn/phpbb/trunk@8716 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-07-29 14:57:54 +00:00
parent e9b2e6174e
commit be1849a901

View file

@ -45,8 +45,9 @@ function mcp_topic_view($id, $mode, $action)
$forum_id = request_var('f', 0); $forum_id = request_var('f', 0);
$to_topic_id = request_var('to_topic_id', 0); $to_topic_id = request_var('to_topic_id', 0);
$to_forum_id = request_var('to_forum_id', 0); $to_forum_id = request_var('to_forum_id', 0);
$post_id_list = request_var('post_id_list', array(0));
$sort = isset($_POST['sort']) ? true : false; $sort = isset($_POST['sort']) ? true : false;
$submitted_id_list = request_var('post_ids', array(0));
$checked_ids = $post_id_list = request_var('post_id_list', array(0));
// Split Topic? // Split Topic?
if ($action == 'split_all' || $action == 'split_beyond') if ($action == 'split_all' || $action == 'split_beyond')
@ -112,7 +113,7 @@ function mcp_topic_view($id, $mode, $action)
{ {
$posts_per_page = $total; $posts_per_page = $total;
} }
if (!empty($sort_days_old) && $sort_days_old != $sort_days) if ((!empty($sort_days_old) && $sort_days_old != $sort_days) || $total <= $posts_per_page)
{ {
$start = 0; $start = 0;
} }
@ -225,7 +226,7 @@ function mcp_topic_view($id, $mode, $action)
'S_POST_REPORTED' => ($row['post_reported']) ? true : false, 'S_POST_REPORTED' => ($row['post_reported']) ? true : false,
'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true, 'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true,
'S_CHECKED' => ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? true : false, 'S_CHECKED' => (!$submitted_id_list || !in_array(intval($row['post_id']), $submitted_id_list) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,
'U_POST_DETAILS' => "$url&amp;i=$id&amp;p={$row['post_id']}&amp;mode=post_details" . (($forum_id) ? "&amp;f=$forum_id" : ''), 'U_POST_DETAILS' => "$url&amp;i=$id&amp;p={$row['post_id']}&amp;mode=post_details" . (($forum_id) ? "&amp;f=$forum_id" : ''),
@ -278,6 +279,7 @@ function mcp_topic_view($id, $mode, $action)
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(
'st_old' => $sort_days, 'st_old' => $sort_days,
'post_ids' => $post_id_list,
)); ));
$template->assign_vars(array( $template->assign_vars(array(