mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 11:13:59 +02:00
Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus
* 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:
@@ -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];
|
||||
|
||||
|
Reference in New Issue
Block a user