diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 21:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-18 21:03:56 +0000 |
| commit | 3c02d5f2df00cecd6a0bc4a945ee3355bd423a81 (patch) | |
| tree | 0c2d02685fee117d7643e13e0aa4f9da1956000d /phpBB/includes/mcp/mcp_topic.php | |
| parent | 7e25c8d9cc255fbe460c2a970ad7da241c0880bb (diff) | |
| download | forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.gz forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.bz2 forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.tar.xz forums-3c02d5f2df00cecd6a0bc4a945ee3355bd423a81.zip | |
- fixing a few tiny bugs
- added new function to (re)apply sids where needed (login and mcp quickmod) - #1829
git-svn-id: file:///svn/phpbb/trunk@5931 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index b6a9bebd83..b8fbfd3bae 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -380,12 +380,8 @@ function split_topic($action, $topic_id, $to_forum_id, $subject) confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { @@ -476,12 +472,8 @@ function merge_posts($topic_id, $to_topic_id) confirm_box(false, 'MERGE_POSTS', $s_hidden_fields); } - $redirect = request_var('redirect', "index.$phpEx$SID"); - - if (strpos($redirect, '?') === false) - { - $redirect = substr_replace($redirect, ".$phpEx$SID&", strpos($redirect, '&'), 1); - } + $redirect = request_var('redirect', "index.$phpEx"); + $redirect = reapply_sid($redirect); if (!$success_msg) { |