diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-08-19 13:55:41 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-08-19 13:55:41 +0200 |
| commit | 19df77c249f23f00d247799ca9deaf4fd923e2bf (patch) | |
| tree | 11714c97316054d70447e9c9ac396feb8bfb0650 | |
| parent | ed4953a1cd8438a3310332f05e335954272a4318 (diff) | |
| parent | 94f4f67f3084eb81d792d8a9b9ae147ef14726d7 (diff) | |
Merge pull request #1615 from Alkarex/author_sanitize
Author HTML to text
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/Models/Feed.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index efb31a752..3caf39d3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ * Bug fixing * PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584), [#1594](https://github.com/FreshRSS/FreshRSS/pull/1594) * Fix API compatibility bug between PostgreSQL and EasyRSS [#1603](https://github.com/FreshRSS/FreshRSS/pull/1603) - * Fix PostgreSQL error when adding new entries [#1610](https://github.com/FreshRSS/FreshRSS/issues/1610), [#1613](https://github.com/FreshRSS/FreshRSS/pull/1613) + * Fix PostgreSQL error when adding entries with duplicated GUID [#1610](https://github.com/FreshRSS/FreshRSS/issues/1610) + * Fix for RSS feeds containing HTML in author field [#1590](https://github.com/FreshRSS/FreshRSS/issues/1590) * Misc. * Allow longer database usernames [#1597](https://github.com/FreshRSS/FreshRSS/issues/1597) diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 52d49db6e..4f11d32e9 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -339,7 +339,7 @@ class FreshRSS_Feed extends Minz_Model { $this->id(), $item->get_id(false, false), $title === null ? '' : $title, - $author === null ? '' : html_only_entity_decode($author->name), + $author === null ? '' : html_only_entity_decode(strip_tags($author->name)), $content === null ? '' : $content, $link === null ? '' : $link, $date ? $date : time() |