mirrors/rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2024-10-22 19:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FormatAbstract]: Ensure sanitizeHtml is given string (#2791)

Browse source 
Sometimes `Item::getContent` returns `null`, in which case `sanitizeHtml`
would pass it to `str_replace`, which would raise `E_DEPRECATED` on PHP 8.1.
This commit is contained in:
Jan Tojnar 2022-06-17 20:46:15 +02:00 committed by GitHub
parent 9ac494b350
commit 10eb1c9a95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
formats/JsonFormat.php
View file

@ -49,7 +49,7 @@ class JsonFormat extends FormatAbstract {
$entryTitle = $item->getTitle();
$entryUri = $item->getURI();
$entryTimestamp = $item->getTimestamp();
$entryContent = $this->sanitizeHtml($item->getContent());
$entryContent = $item->getContent() ? $this->sanitizeHtml($item->getContent()) : '';
$entryEnclosures = $item->getEnclosures();
$entryCategories = $item->getCategories();

2
formats/MrssFormat.php
View file

@ -100,7 +100,7 @@ class MrssFormat extends FormatAbstract {
$itemTimestamp = $item->getTimestamp();
$itemTitle = $item->getTitle();
$itemUri = $item->getURI();
$itemContent = $this->sanitizeHtml($item->getContent());
$itemContent = $item->getContent() ? $this->sanitizeHtml($item->getContent()) : '';
$entryID = $item->getUid();
$isPermaLink = 'false';

2
lib/FormatAbstract.php
View file

@ -130,7 +130,7 @@ abstract class FormatAbstract implements FormatInterface {
* @todo Maybe switch to http://htmlpurifier.org/
* @todo Maybe switch to http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/index.php
*/
protected function sanitizeHtml($html)
protected function sanitizeHtml(string $html): string
{
$html = str_replace('<script', '<&zwnj;script', $html); // Disable scripts, but leave them visible.
$html = str_replace('<iframe', '<&zwnj;iframe', $html);