servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:tt-rss/tt-rss

This commit is contained in:
Andrew Dolgov 2022-10-15 13:46:02 +03:00
parent f56a049641 7eb711eefa
commit 602e868425
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/errorhandler.php
View File

@ -43,10 +43,11 @@ function format_backtrace($trace): string {
} }
function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool { function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool {
// return true in order to avoid default error handling by PHP
if (version_compare(PHP_VERSION, '8.0.0', '<')) { if (version_compare(PHP_VERSION, '8.0.0', '<')) {
if (error_reporting() == 0 || !$errno) return false; if (error_reporting() == 0 || !$errno) return true;
} else { } else {
if (!(error_reporting() & $errno)) return false; if (!(error_reporting() & $errno)) return true;
} }
$file = substr(str_replace(dirname(__DIR__), "", $file), 1); $file = substr(str_replace(dirname(__DIR__), "", $file), 1);