diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-27 15:04:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-27 15:04:54 +0000 |
| commit | 266797fddf049d89923d9885cfecd022d9875fb3 (patch) | |
| tree | d997e17446799f149c399b2c7848ebf44471e67b /phpBB/includes/mcp/mcp_warn.php | |
| parent | 9ee570aebd300a89daffc67e24d3e33caee4653e (diff) | |
| download | forums-266797fddf049d89923d9885cfecd022d9875fb3.tar forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.gz forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.bz2 forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.xz forums-266797fddf049d89923d9885cfecd022d9875fb3.zip | |
#10163
git-svn-id: file:///svn/phpbb/trunk@7411 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index f041732b8a..681a066af7 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -234,7 +234,11 @@ class mcp_warn $user_id = $user_row['user_id']; - $this->p_master->adjust_url('&f=' . $forum_id . '&p=' . $post_id); + if (strpos($this->u_action, "&f=$forum_id&p=$post_id") === false) + { + $this->p_master->adjust_url("&f=$forum_id&p=$post_id"); + $this->u_action .= "&f=$forum_id&p=$post_id"; + } if ($warning && $action == 'add_warning') { @@ -274,7 +278,7 @@ class mcp_warn $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action . "p=$post_id", + 'U_POST_ACTION' => $this->u_action, 'POST' => $message, 'USERNAME' => $user_row['username'], @@ -326,7 +330,11 @@ class mcp_warn $user_id = $user_row['user_id']; - $this->p_master->adjust_url('&u=' . $user_id); + if (strpos($this->u_action, "&u=$user_id") === false) + { + $this->p_master->adjust_url('&u=' . $user_id); + $this->u_action .= "&u=$user_id"; + } if ($warning && $action == 'add_warning') { @@ -348,7 +356,7 @@ class mcp_warn // OK, they didn't submit a warning so lets build the page for them to do so $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action . "u=$user_id", + 'U_POST_ACTION' => $this->u_action, 'USERNAME' => $user_row['username'], 'USER_COLOR' => (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '', |