diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-08-19 15:36:32 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-08-19 15:36:32 +0200 |
| commit | 2fa8fdd28e058c818881a593df59700dcb96becd (patch) | |
| tree | 6e4250f60a770e61a480e9b41860c4d4600e5dee | |
| parent | 5d4e4a8dd0702e42088bd93dca2158a3cb05b7a4 (diff) | |
| parent | 19df77c249f23f00d247799ca9deaf4fd923e2bf (diff) | |
Merge branch 'FreshRSS/dev' into cli_update_user
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | CREDITS.md | 1 | ||||
| -rw-r--r-- | app/Models/EntryDAOPGSQL.php | 5 | ||||
| -rw-r--r-- | app/Models/Feed.php | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c11be1e..3caf39d3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +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 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/CREDITS.md b/CREDITS.md index 70c7437a9..9d123f7c2 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -6,6 +6,7 @@ People are sorted by name so please keep this order. --- +* [Adrien Dorsaz](https://github.com/Trim): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Trim), [Web](https://adorsaz.ch/) * [Alexandre Alapetite](https://github.com/Alkarex): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alkarex), [Web](http://alexandre.alapetite.fr/) * [Alexis Degrugillier](https://github.com/aledeg): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=aledeg) * [Alwaysin](https://github.com/Alwaysin): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Alwaysin) diff --git a/app/Models/EntryDAOPGSQL.php b/app/Models/EntryDAOPGSQL.php index b25993c47..6e6f9e658 100644 --- a/app/Models/EntryDAOPGSQL.php +++ b/app/Models/EntryDAOPGSQL.php @@ -30,7 +30,10 @@ maxrank bigint := (SELECT MAX(id) FROM `' . $this->prefix . 'entrytmp`); rank bigint := (SELECT maxrank - COUNT(*) FROM `' . $this->prefix . 'entrytmp`); BEGIN INSERT INTO `' . $this->prefix . 'entry` (id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags) - (SELECT rank + row_number() OVER(ORDER BY date) AS id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags FROM `' . $this->prefix . 'entrytmp` ORDER BY date); + (SELECT rank + row_number() OVER(ORDER BY date) AS id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags + FROM `' . $this->prefix . 'entrytmp` AS etmp + WHERE NOT EXISTS (SELECT 1 FROM `' . $this->prefix . 'entry` AS ereal WHERE etmp.id_feed = ereal.id_feed AND etmp.guid = ereal.guid) + ORDER BY date); DELETE FROM `' . $this->prefix . 'entrytmp` WHERE id <= maxrank; END $$;'; $hadTransaction = $this->bd->inTransaction(); 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() |