Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css

1 files changed, 37 insertions, 0 deletions

diff --git a/include/errorhandler.php b/include/errorhandler.php
new file mode 100644
index 000000000..9acef2357
--- /dev/null
+++ b/include/errorhandler.php
@@ -0,0 +1,37 @@
+<?php
+function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
+	global $logger;
+
+	if (error_reporting() == 0 || !$errno) return false;
+
+	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+
+	return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+}
+
+function ttrss_fatal_handler() {
+	global $logger;
+
+	$error = error_get_last();
+
+	if ($error !== NULL) {
+		$errno = $error["type"];
+		$file = $error["file"];
+		$line = $error["line"];
+		$errstr  = $error["message"];
+
+		if (!$errno) return false;
+
+		$context = debug_backtrace();
+
+		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+
+		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+	}
+
+	return false;
+}
+
+register_shutdown_function('ttrss_fatal_handler');
+set_error_handler('ttrss_error_handler');
+?>