From aca75cb5cb323535099c7aef46a78ea3cec082f2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:05:52 +0400
Subject: reinstate error handlers; better DB error reporting on failed queries

---
 include/errorhandler.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 45496b18b..b1a0d3d0c 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,7 +1,7 @@
 <?php
 // TODO: make configurable
-//require_once "classes/logger.php";
-//require_once "classes/logger/sql.php";
+require_once "classes/logger.php";
+require_once "classes/logger/sql.php";
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 	global $logger;
@@ -37,11 +37,16 @@ function ttrss_fatal_handler() {
 		if (!$logger) $logger = new Logger_SQL();
 
 		if ($logger) {
-			$logger->log_error($errno, $errstr, $file, $line, $context);
+			if ($logger->log_error($errno, $errstr, $file, $line, $context)) {
+				return true;
+			}
 		}
+		return false;
 	}
+
+	return false;
 }
 
-//register_shutdown_function('ttrss_fatal_handler');
-//set_error_handler('ttrss_error_handler');
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
 ?>
-- 
cgit v1.2.3-54-g00ecf