diff options
| author | Senky <jakubsenko@gmail.com> | 2012-04-15 19:13:08 +0200 |
|---|---|---|
| committer | Senky <jakubsenko@gmail.com> | 2012-04-15 19:13:08 +0200 |
| commit | 807eccc97632ea8beee4485ef926e4436da2554c (patch) | |
| tree | 2bfa09fbe5b272b2ee51d8f14810501642e73456 | |
| parent | e6a1d37634fb9f9f53125460abdaf9c90d8858a7 (diff) | |
| download | forums-807eccc97632ea8beee4485ef926e4436da2554c.tar forums-807eccc97632ea8beee4485ef926e4436da2554c.tar.gz forums-807eccc97632ea8beee4485ef926e4436da2554c.tar.bz2 forums-807eccc97632ea8beee4485ef926e4436da2554c.tar.xz forums-807eccc97632ea8beee4485ef926e4436da2554c.zip | |
[ticket/9918] default values in request_var changed to one string
As per marc1706's note, all request_var functions now have only one string in default value
PHPBB3-9918
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 889e0a368c..4e40af934c 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -433,7 +433,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); } - $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id"); + $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id"); $redirect = reapply_sid($redirect); if (!$success_msg) diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 7ed4908280..e96c025795 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -529,7 +529,7 @@ 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', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id"); + $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id"); $redirect = reapply_sid($redirect); if (!$success_msg) @@ -635,7 +635,7 @@ function merge_posts($topic_id, $to_topic_id) confirm_box(false, 'MERGE_POSTS', $s_hidden_fields); } - $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id"); + $redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&t=$to_topic_id"); $redirect = reapply_sid($redirect); if (!$success_msg) |