From 97681613274c35061bcbd8d14e03600d5fb18345 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 5 May 2016 07:51:55 +0200
Subject: [PATCH] simplify the code a bit

---
 inc/display.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 90cf3434..58cb4805 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -94,21 +94,16 @@ function error($message, $priority = true, $debug_stuff = false) {
 		$debug_stuff['backtrace'] = debug_backtrace();
 	}
 
-	// Return the bad request header, necessary for AJAX posts
-	// czaks: is it really so? the ajax errors only work when this is commented out
-	//		better yet use it when ajax is disabled
-	if (!isset ($_POST['json_response'])) {
-		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
-	}
-	
-	// Is there a reason to disable this?
 	if (isset($_POST['json_response'])) {
 		header('Content-Type: text/json; charset=utf-8');
 		die(json_encode(array(
 			'error' => $message
 		)));
 	}
-	
+	else {
+		header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
+	}
+
 	$pw = $config['db']['password'];
 	$debug_callback = function(&$item) use (&$debug_callback, $pw) {
 		if (is_array($item)) {