Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD

Conflicts:
	templates/themes/basic/index.html

1 files changed, 12 insertions, 0 deletions

diff --git a/inc/display.php b/inc/display.php
index bcde41d0..4e8ab8fb 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -109,6 +109,18 @@ function error($message, $priority = true, $debug_stuff = false) {
 		)));
 	}
 	
+	$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'),