diff options
| -rw-r--r-- | lib/lib_rss.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 2fca6896f..7636ee225 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -150,16 +150,16 @@ function safe_ascii(?string $text): string { } if (function_exists('mb_convert_encoding')) { - function safe_utf8(string $text): string { - return mb_convert_encoding($text, 'UTF-8', 'UTF-8') ?: ''; + function safe_utf8(?string $text): string { + return $text === null ? '' : (mb_convert_encoding($text, 'UTF-8', 'UTF-8') ?: ''); } } elseif (function_exists('iconv')) { - function safe_utf8(string $text): string { - return iconv('UTF-8', 'UTF-8//IGNORE', $text) ?: ''; + function safe_utf8(?string $text): string { + return $text === null ? '' : (iconv('UTF-8', 'UTF-8//IGNORE', $text) ?: ''); } } else { - function safe_utf8(string $text): string { - return $text; + function safe_utf8(?string $text): string { + return $text ?? ''; } } |