first stage of headline element handling refactoring

[tt-rss.git] / include / errorhandler.php

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 8189feafba55d58e1752b767572f46673cce820a..95c9edc69df9ac7b8ad3f414741a844a88b3fe6c 100644 (file)
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -32,22 +32,18 @@ function format_backtrace($trace) {
 }
 
 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]";
        $context = format_backtrace(debug_backtrace());
+       $errstr = truncate_middle($errstr, 16384, " (...) ");
 
        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();
@@ -75,4 +71,4 @@ function ttrss_fatal_handler() {
 
 register_shutdown_function('ttrss_fatal_handler');
 set_error_handler('ttrss_error_handler');
-?>
+