summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Walker <mike@barrucadu.co.uk>2015-05-10 13:22:53 +0100
committerMichael Walker <mike@barrucadu.co.uk>2015-05-10 13:22:53 +0100
commit61d9dacdfb1f8b51ea89f6f3077e56ed8f622644 (patch)
tree4f448a2af95e35aa36bff71c069d1ac5131a9914
parent649255c9b9bff02686c1b7370474a414c70b8442 (diff)
When banning/deleting a post, return to the thread, not the board index (unless deleting the OP)
-rw-r--r--inc/mod/pages.php14
-rw-r--r--templates/mod/ban_form.html3
2 files changed, 15 insertions, 2 deletions
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 07fc4ddd..cb798767 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -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);
}
diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
index 6c7560ad..911a8dcd 100644
--- a/templates/mod/ban_form.html
+++ b/templates/mod/ban_form.html
@@ -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>