diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-11-23 14:10:56 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-11-23 14:10:56 +0000 |
| commit | 81ccfed4b447bee43a330f26560325d11e908737 (patch) | |
| tree | da5ce6dafa6bd4e7de605c4b335e2e36d2f72573 /include | |
| parent | 9c1fb45d73b6719f7c7bc6e0423a7faef75a2796 (diff) | |
| parent | 4dc0e8cd29503a0a8a8979484c8b7a36f886b840 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/errorhandler.php | 8 | ||||
| -rw-r--r-- | include/functions.php | 6 |
2 files changed, 3 insertions, 11 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); diff --git a/include/functions.php b/include/functions.php index c77b68828..9fb98c60b 100644 --- a/include/functions.php +++ b/include/functions.php @@ -5,10 +5,6 @@ /** @deprecated by Config::SCHEMA_VERSION */ define('SCHEMA_VERSION', Config::SCHEMA_VERSION); - if (version_compare(PHP_VERSION, '8.0.0', '<')) { - libxml_disable_entity_loader(true); - } - libxml_use_internal_errors(true); // separate test because this is included before sanity checks @@ -147,7 +143,7 @@ } } - if (!empty($_SESSION["uid"]) && get_schema_version() >= 120) { + if (!empty($_SESSION["uid"]) && Config::get_schema_version() >= 120) { $pref_locale = Prefs::get(Prefs::USER_LANGUAGE, $_SESSION["uid"], $_SESSION["profile"] ?? null); if (!empty($pref_locale) && $pref_locale != 'auto') { |