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

Conflicts:
	js/quick-reply.js

1 files changed, 3 insertions, 1 deletions

diff --git a/js/ajax.js b/js/ajax.js
index ee2ff7b5..8f0f7258 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -12,6 +12,7 @@
  */
 
 $(window).ready(function() {
+	var settings = new script_settings('ajax');
 	var do_not_ajax = false;
 	
 	var setup_form = function($form) {
@@ -68,7 +69,8 @@ $(window).ready(function() {
 							$(form).find('input[type="submit"]').removeAttr('disabled');
 						}
 					} else if (post_response.redirect && post_response.id) {
-						if (!$(form).find('input[name="thread"]').length) {
+						if (!$(form).find('input[name="thread"]').length
+							|| (!settings.get('always_noko_replies', true) && !post_response.noko)) {
 							document.location = post_response.redirect;
 						} else {
 							$.ajax({