logger: record last query before logged error

1 files changed, 6 insertions, 0 deletions

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 52431c2de..21cc9a94d 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,17 +1,21 @@
 <?php
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
+	global $last_query;
 
 	if (error_reporting() == 0 || !$errno) return false;
 
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
+	if ($last_query) $errstr .= " [Last query: $last_query]";
+
 	if (class_exists("Logger"))
 		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 }
 
 function ttrss_fatal_handler() {
 	global $logger;
+	global $last_query;
 
 	$error = error_get_last();
 
@@ -27,6 +31,8 @@ function ttrss_fatal_handler() {
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
+		if ($last_query) $errstr .= " [Last query: $last_query]";
+
 		if (class_exists("Logger"))
 			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 	}