diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-02-07 01:18:02 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-02-07 01:18:02 +0000 |
| commit | 660bcb06365a1687c757a6ac8e056f44363a31de (patch) | |
| tree | b68e017b7bc3ab0ab08ad962f81e5f469ef8bc36 /phpBB/mcp.php | |
| parent | cab4c3c9d13167aa09f1ab393f238491e2de5ab3 (diff) | |
| download | forums-660bcb06365a1687c757a6ac8e056f44363a31de.tar forums-660bcb06365a1687c757a6ac8e056f44363a31de.tar.gz forums-660bcb06365a1687c757a6ac8e056f44363a31de.tar.bz2 forums-660bcb06365a1687c757a6ac8e056f44363a31de.tar.xz forums-660bcb06365a1687c757a6ac8e056f44363a31de.zip | |
MCP update: topic selection for merge should now work... better
git-svn-id: file:///svn/phpbb/trunk@3462 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/mcp.php')
| -rw-r--r-- | phpBB/mcp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php index bdb6dd2074..5efc9d1c5a 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -463,7 +463,7 @@ switch ($mode) 'TO_TOPIC_ID' => ($to_topic_id) ? $to_topic_id : '', 'TO_TOPIC_EXPLAIN' => ($to_topic_id) ? sprintf($user->lang['Topic_number_is'], $to_topic_id, '<a href="viewtopic.' . $phpEx . $SID . '&t=' . $to_topic_id . '" target="_new">' . htmlspecialchars($topic_data[$to_topic_id]['topic_title']) . '</a>') : '', - 'S_FORM_ACTION' => "mcp.$phpEx$SID", + 'S_FORM_ACTION' => $mcp_url, 'S_FORUM_SELECT' => '<select name="new_forum_id">' . make_forum_select() . '</select>', 'S_ENABLE_SPLIT' => ($mode == 'topic_view' || $mode == 'split') ? TRUE : FALSE, 'S_ENABLE_MERGE' => ($mode == 'topic_view' || $mode == 'merge') ? TRUE : FALSE, @@ -767,7 +767,7 @@ switch ($mode) $template->assign_block_vars('topicrow', array( 'U_VIEW_TOPIC' => $mcp_url . '&t=' . $row['topic_id'] . '&mode=topic_view', - 'S_MERGE_SELECT' => ($topic_id && !empty($_GET['post_id_list'])) ? sprintf($user->lang['Select_for_merge'], '<a href="' . $mcp_url . '&mode=merge&to_topic_id=' . $row['topic_id'] . '&post_id_list=' . htmlspecialchars(@$_GET['post_id_list']) . '">', '</a>') : '', + 'S_MERGE_SELECT' => ($topic_id && isset($_GET['post_id_list']) && $row['topic_id'] != $topic_id) ? sprintf($user->lang['Select_for_merge'], '<a href="' . $mcp_url . '&mode=merge&to_topic_id=' . $row['topic_id'] . $url_extra . '">', '</a>') : '', 'TOPIC_FOLDER_IMG' => $folder_img, 'TOPIC_TYPE' => $topic_type, |