Remove superflous extra error handling from merge of upstream vichan

1 files changed, 0 insertions, 58 deletions

diff --git a/inc/display.php b/inc/display.php
index 58cb4805..ce39197c 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -71,64 +71,6 @@ function createBoardlist($mod=false) {
 	);
 }
 
-function error($message, $priority = true, $debug_stuff = false) {
-	global $board, $mod, $config, $db_error;
-	
-	if ($config['syslog'] && $priority !== false) {
-		// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
-		_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
-	}
-	
-	if (defined('STDIN')) {
-		// Running from CLI
-		echo('Error: ' . $message . "\n");
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		die();
-	}
-
-	if ($config['debug'] && isset($db_error)) {
-		$debug_stuff = array_combine(array('SQLSTATE', 'Error code', 'Error message'), $db_error);
-	}
-
-	if ($config['debug']) {
-		$debug_stuff['backtrace'] = debug_backtrace();
-	}
-
-	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)) {
-			$item = array_filter($item, $debug_callback);
-		}
-		return ($item !== $pw || !$pw);
-	};
-
-
-	if ($debug_stuff) 
-		$debug_stuff = array_filter($debug_stuff, $debug_callback);
-
-	die(Element('page.html', array(
-		'config' => $config,
-		'title' => _('Error'),
-		'subtitle' => _('An error has occured.'),
-		'body' => Element('error.html', array(
-			'config' => $config,
-			'message' => $message,
-			'mod' => $mod,
-			'board' => isset($board) ? $board : false,
-			'debug' => is_array($debug_stuff) ? str_replace("\n", '
', utf8tohtml(print_r($debug_stuff, true))) : utf8tohtml($debug_stuff)
-		))
-	)));
-}
 
 function loginForm($error=false, $username=false, $redirect=false) {
 	global $config;