diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 14:57:54 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 14:57:54 +0000 |
| commit | be1849a901261c6dd00b464f1d74505da0297f7a (patch) | |
| tree | c260f76f6a3356f89c41872c57ab1de8d2a12c92 | |
| parent | e9b2e6174e6f26208595a40c69b5448369c27f54 (diff) | |
| download | forums-be1849a901261c6dd00b464f1d74505da0297f7a.tar forums-be1849a901261c6dd00b464f1d74505da0297f7a.tar.gz forums-be1849a901261c6dd00b464f1d74505da0297f7a.tar.bz2 forums-be1849a901261c6dd00b464f1d74505da0297f7a.tar.xz forums-be1849a901261c6dd00b464f1d74505da0297f7a.zip | |
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
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 5c4c1feaad..a8419b5f79 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -45,8 +45,9 @@ function mcp_topic_view($id, $mode, $action) $forum_id = request_var('f', 0); $to_topic_id = request_var('to_topic_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; + $submitted_id_list = request_var('post_ids', array(0)); + $checked_ids = $post_id_list = request_var('post_id_list', array(0)); // Split Topic? if ($action == 'split_all' || $action == 'split_beyond') @@ -112,7 +113,7 @@ function mcp_topic_view($id, $mode, $action) { $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; } @@ -225,7 +226,7 @@ function mcp_topic_view($id, $mode, $action) 'S_POST_REPORTED' => ($row['post_reported']) ? true : false, '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, 'U_POST_DETAILS' => "$url&i=$id&p={$row['post_id']}&mode=post_details" . (($forum_id) ? "&f=$forum_id" : ''), @@ -278,6 +279,7 @@ function mcp_topic_view($id, $mode, $action) $s_hidden_fields = build_hidden_fields(array( 'st_old' => $sort_days, + 'post_ids' => $post_id_list, )); $template->assign_vars(array( |