diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-05-12 03:06:25 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-05-12 03:06:25 +0000 |
| commit | f8302cbebf00d2fc158a1a84ea0c9af0f1a48787 (patch) | |
| tree | abe0dd7d6cb6b46e6a56b335039bbc0b0d26195a | |
| parent | 6244422da939bc2b06739b5ef6ac129bf88df42e (diff) | |
| download | forums-f8302cbebf00d2fc158a1a84ea0c9af0f1a48787.tar forums-f8302cbebf00d2fc158a1a84ea0c9af0f1a48787.tar.gz forums-f8302cbebf00d2fc158a1a84ea0c9af0f1a48787.tar.bz2 forums-f8302cbebf00d2fc158a1a84ea0c9af0f1a48787.tar.xz forums-f8302cbebf00d2fc158a1a84ea0c9af0f1a48787.zip | |
#10683
git-svn-id: file:///svn/phpbb/trunk@7538 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 52b9a5af73..5fc907dddf 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -20,8 +20,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info) include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - $url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url()); - // merge_topic is the quickmod action, merge_topics is the mcp_forum action, and merge_select is the mcp_topic action $merge_select = ($action == 'merge_select' || $action == 'merge_topic' || $action == 'merge_topics') ? true : false; @@ -38,6 +36,14 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $source_topic_ids = array(request_var('t', 0)); $to_topic_id = request_var('to_topic_id', 0); + $url_extra = ''; + $url_extra .= ($forum_id) ? "&f=$forum_id" : ''; + $url_extra .= ($GLOBALS['topic_id']) ? '&t=' . $GLOBALS['topic_id'] : ''; + $url_extra .= ($GLOBALS['post_id']) ? '&p=' . $GLOBALS['post_id'] : ''; + $url_extra .= ($GLOBALS['user_id']) ? '&u=' . $GLOBALS['user_id'] : ''; + + $url = append_sid("{$phpbb_root_path}mcp.$phpEx?$url_extra"); + // Resync Topics switch ($action) { |