af_elreg: remove ads

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

diff --git a/include/errorhandler.php b/include/errorhandler.php
index f7fadc17236a01b187897c23f6d0fe8cb0f25928..52431c2de41004ade39892b2289a9b28bd3e6861 100644 (file)
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -1,22 +1,13 @@
 <?php
-// TODO: make configurable
-require_once "classes/logger.php";
-require_once "classes/logger/sql.php";
-
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
        global $logger;
 
-       if (error_reporting() == 0) return false;
-
-       if (!$logger) $logger = new Logger_SQL();
+       if (error_reporting() == 0 || !$errno) return false;
 
        $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-       if ($logger) {
-               return $logger->log_error($errno, $errstr, $file, $line, $context);
-       }
-
-       return false;
+       if (class_exists("Logger"))
+               return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
 }
 
 function ttrss_fatal_handler() {
@@ -30,16 +21,17 @@ function ttrss_fatal_handler() {
                $line = $error["line"];
                $errstr  = $error["message"];
 
+               if (!$errno) return false;
+
                $context = debug_backtrace();
 
                $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-               if (!$logger) $logger = new Logger_SQL();
-
-               if ($logger) {
-                       $logger->log_error($errno, $errstr, $file, $line, $context);
-               }
+               if (class_exists("Logger"))
+                       return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
        }
+
+       return false;
 }
 
 register_shutdown_function('ttrss_fatal_handler');