mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus

Browse Source 
* github-nickvergessen/ticket/11352:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
This commit is contained in:
Nils Adermann
2014-04-10 13:56:30 -07:00
parent 2284e2897f 6593e028be
commit 79fe781629
2 changed files with 335 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/mcp/mcp_queue.php
View File

@@ -1163,6 +1163,22 @@ class mcp_queue
$success_msg .= '_DELETED_SUCCESS';
}
// If we came from viewtopic, we try to go back to it.
if (strpos($redirect, $phpbb_root_path . 'viewtopic.' . $phpEx) === 0)
{
if ($num_disapproved_topics == 0)
{
// So we need to remove the post id part from the Url
$redirect = str_replace("&p={$post_id_list[0]}#p{$post_id_list[0]}", '', $redirect);
}
else
{
// However this is only possible if the topic still exists,
// Otherwise we go back to the viewforum page
$redirect = append_sid($phpbb_root_path . 'viewforum.' . $phpEx, 'f=' . $request->variable('f', 0));
}
}
meta_refresh(3, $redirect);
$message = $user->lang[$success_msg];