Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	js/quick-reply.js

1 files changed, 1 insertions, 0 deletions

diff --git a/post.php b/post.php
index f7789e59..556de639 100644
--- a/post.php
+++ b/post.php
@@ -775,6 +775,7 @@ if (isset($_POST['delete'])) {
 		header('Content-Type: text/json; charset=utf-8');
 		echo json_encode(array(
 			'redirect' => $redirect,
+			'noko' => $config['always_noko'] || $noko,
 			'id' => $id
 		));
 	}