diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-13 15:22:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-13 15:22:33 +0000 |
| commit | 7c1b3ed62aeab31b4f226600a0585226ed44bfea (patch) | |
| tree | b50ef00b761110db2da37a652582e0510de4d826 /phpBB | |
| parent | 44708b7ebbef0c5a875954141ab751728ef15a87 (diff) | |
| download | forums-7c1b3ed62aeab31b4f226600a0585226ed44bfea.tar forums-7c1b3ed62aeab31b4f226600a0585226ed44bfea.tar.gz forums-7c1b3ed62aeab31b4f226600a0585226ed44bfea.tar.bz2 forums-7c1b3ed62aeab31b4f226600a0585226ed44bfea.tar.xz forums-7c1b3ed62aeab31b4f226600a0585226ed44bfea.zip | |
#22685
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8430 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_post.html | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ba51befde5..a529c3dc9a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -135,6 +135,7 @@ <li>[Fix] Fixing some XHTML errors/warnings within the ACP (Bug #22875)</li> <li>[Fix] Warnings if poll title/options exceed maximum characters per post (Bug #22865)</li> <li>[Fix] Do not allow selecting non-authorized groups within memberlist by adjusting URL (Bug #22805 - patch provided by ToonArmy)</li> + <li>[Fix] Correctly specify "close report action" (Bug #22685)</li> </ul> diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 37ea7e5132..9419a37ab8 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -186,7 +186,7 @@ class mcp_reports $template->assign_vars(array( 'S_MCP_REPORT' => true, - 'S_CLOSE_ACTION' => $this->u_action . '&p=' . $post_id . '&f=' . $forum_id, + 'S_CLOSE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), 'S_POST_REPORTED' => $post_info['post_reported'], 'S_POST_UNAPPROVED' => !$post_info['post_approved'], diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index b7c59b9a8b..b4706ec9ac 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -24,7 +24,7 @@ <span class="corners-bottom"><span></span></span></div> </div> - <form method="post" id="mcp_report" action="{U_CLOSE_ACTION}"> + <form method="post" id="mcp_report" action="{S_CLOSE_ACTION}"> <fieldset class="submit-buttons"> <!-- IF S_POST_REPORTED --> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 1b16f8e92b..402f25a655 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -1,7 +1,7 @@ <!-- INCLUDE mcp_header.html --> <!-- IF S_MCP_REPORT --> - <form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"> + <form method="post" name="mcp_report" action="{S_CLOSE_ACTION}"> <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> @@ -39,7 +39,7 @@ <br clear="all"/> <!-- ENDIF --> -<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report_details" action="{U_CLOSE_ACTION}"><!-- ENDIF --> +<!-- IF S_MCP_QUEUE --><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}"><!-- ELSE --><form method="post" name="mcp_report_details" action="{S_CLOSE_ACTION}"><!-- ENDIF --> <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"> <tr> |