When banning/deleting a post, return to the thread, not the board index (unless deleting the OP)

This commit is contained in:
Michael Walker 2015-05-10 13:22:53 +01:00
parent 649255c9b9
commit 61d9dacdfb
2 changed files with 15 additions and 2 deletions

View File

@ -1431,8 +1431,14 @@ function mod_ban_post($board, $delete, $post, $token = false) {
// Rebuild themes
rebuildThemes('post-delete', $board);
}
header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
if(isset($_POST['thread'])) {
// Redirect to thread
header('Location: ?/' . sprintf($config['board_path'], $board) . $config['dir']['res'] . str_replace('%d', $_POST['thread'], $config['file_page']), true, $config['redirect_http']);
} else {
// Redirect to board index.
header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
}
}
$args = array(
@ -1444,6 +1450,10 @@ function mod_ban_post($board, $delete, $post, $token = false) {
'boards' => listBoards(),
'token' => $security_token
);
if($_GET['thread']) {
$args['thread'] = $_GET['thread'];
}
mod_page(_('New ban'), 'mod/ban_form.html', $args);
}

View File

@ -12,6 +12,9 @@
{% if post and board %}
<input type="hidden" name="delete" value="{% if delete %}1{% else %}0{% endif %}">
{% endif %}
{% if thread %}
<input type="hidden" name="thread" value="{{ thread }}">
{% endif %}
<table>