summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfox <[email protected]>2022-10-01 12:31:22 +0300
committerfox <[email protected]>2022-10-01 12:31:22 +0300
commit54942b766403df27063214e3e25d1eeabdca8097 (patch)
treec699c36af9e08051fbb428c24a1fcc065b461863
parent0ac143a29b45e35faf7b636e26d4aa854d95602a (diff)
parent504d0afd352d1d388d5c5c96493e1d7479fc6d1a (diff)
Merge pull request 'Fix handling of suppressed errors' (#85) from mechnich/tt-rss:master into master
Reviewed-on: https://dev.tt-rss.org/fox/tt-rss/pulls/85
-rw-r--r--include/errorhandler.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/errorhandler.php b/include/errorhandler.php
index 30b6902b3..da8e4f29c 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -43,14 +43,12 @@ function format_backtrace($trace): string {
}
function ttrss_error_handler(int $errno, string $errstr, string $file, int $line): bool {
- /*if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+ if (version_compare(PHP_VERSION, '8.0.0', '<')) {
if (error_reporting() == 0 || !$errno) return false;
} else {
if (!(error_reporting() & $errno)) return false;
}
- if (error_reporting() == 0 || !$errno) return false;*/
-
$file = substr(str_replace(dirname(__DIR__), "", $file), 1);
$context = format_backtrace(debug_backtrace());