From de1e218a835979a2b9b561cd6d5934cdc436dd67 Mon Sep 17 00:00:00 2001 From: David Edler Date: Tue, 30 Nov 2021 21:50:09 +0100 Subject: various fixes vor php 8.1 compatibility Cherry-picked from https://git-gitea.tt-rss.org/fox/tt-rss/pulls/56, while excluding changes in vendor/ (causes compatiblity issues with PHP<8 [1]) and strftime-related ones (already re-applied in https://git-gitea.tt-rss.org/fox/tt-rss/pulls/66). [1] https://community.tt-rss.org/t/support-for-php-8-1/5089/9 --- classes/feedparser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/feedparser.php') diff --git a/classes/feedparser.php b/classes/feedparser.php index 3ed0647d2..fc2489e2d 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -200,7 +200,7 @@ class FeedParser { // libxml may have invalid unicode data in error messages function error() : string { - return UConverter::transcode($this->error, 'UTF-8', 'UTF-8'); + return UConverter::transcode($this->error ?? '', 'UTF-8', 'UTF-8'); } /** @return array - WARNING: may return invalid unicode data */ -- cgit v1.2.3