Merge branch 'filter-fixes' into 'master'

get filter action descriptions on pref_filters class init instead of doing it...

See merge request tt-rss/tt-rss!78

1 files changed, 2 insertions, 6 deletions

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 4f773bc19..c155c9989 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -41,12 +41,8 @@ function format_backtrace(array $trace): string {
 }
 
 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 (error_reporting() == 0 || !$errno) return true;
-	} else {
-		if (!(error_reporting() & $errno)) return true;
-	}
+	// return true in order to avoid default error handling by PHP
+	if (!(error_reporting() & $errno)) return true;
 
 	$file = substr(str_replace(dirname(__DIR__), "", $file), 1);