diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
| commit | 5c6653717f0a9adce905d1417c8adb4f0f3a5b73 (patch) | |
| tree | c5e3b65b409ae33d52055e33cfed0ee169684023 /phpBB/includes/mcp/mcp_forum.php | |
| parent | 652d349b75262dd8e0db8405d5ca1b7fa654364a (diff) | |
| download | forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.gz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.bz2 forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.xz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.zip | |
fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic)
i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 2f02a21a3f..3f11c96e21 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -28,11 +28,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info) unset($_POST['sk'], $_POST['sd'], $_REQUEST['sk'], $_REQUEST['sd']); } - $forum_id = $forum_info['forum_id']; - $start = request_var('start', 0); - $topic_id_list = request_var('topic_id_list', array(0)); - $post_id_list = request_var('post_id_list', array(0)); - $topic_id = request_var('t', 0); + $forum_id = $forum_info['forum_id']; + $start = request_var('start', 0); + $topic_id_list = request_var('topic_id_list', array(0)); + $post_id_list = request_var('post_id_list', array(0)); + $source_topic_id = request_var('t', 0); // Resync Topics if ($action == 'resync') @@ -216,7 +216,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $topic_row = array_merge($topic_row, array( 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&f=$forum_id&t={$row['topic_id']}&mode=topic_view"), - 'S_SELECT_TOPIC' => ($action == 'merge_select' && $row['topic_id'] != $topic_id) ? true : false, + 'S_SELECT_TOPIC' => ($action == 'merge_select' && $row['topic_id'] != $source_topic_id) ? true : false, 'U_SELECT_TOPIC' => $url . "&i=$id&mode=topic_view&action=merge&to_topic_id=" . $row['topic_id'] . $selected_ids, 'U_MCP_QUEUE' => $u_mcp_queue, 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=topic_view&t=' . $row['topic_id'] . '&action=reports') : '', |