diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-05-28 20:55:44 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-05-28 20:55:44 +0200 |
| commit | 7ebc56e8d3c2f0126d70dc3d5f071f36631a294d (patch) | |
| tree | fe68bc757c470873fa880e6cca19972b4f695aa5 | |
| parent | 5a835f22ce097c1b5d0a4fe0f7113b5455c24cb6 (diff) | |
Fix null exception in shares (#1898)
https://github.com/FreshRSS/FreshRSS/issues/1824
https://github.com/FreshRSS/FreshRSS/issues/1884
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/views/helpers/index/normal/entry_bottom.phtml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index dd6b38d54..0b8da0b64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * Bug fixing * Fix Docker bug affecting Apache `CustomLog` (unwanted local copy of access logs), `ErrorLog`, `Listen` (IPv6 bug) [#1873](https://github.com/FreshRSS/FreshRSS/pull/1873) * Fix muted feeds that were not actually muted [#1844](https://github.com/FreshRSS/FreshRSS/issues/1844) + * Fix null exception in shares, showing only the first article [#1824](https://github.com/FreshRSS/FreshRSS/issues/1824) * Fix errors in case of empty/wrong username when updating user settings [#1857](https://github.com/FreshRSS/FreshRSS/pull/1857) * Fixes in subscription menu [#1858](https://github.com/FreshRSS/FreshRSS/pull/1858) * Fix allowing Unix sockets for MySQL and PostgreSQL [#1888](https://github.com/FreshRSS/FreshRSS/issues/1888) diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml index bc23938b0..793c644f9 100644 --- a/app/views/helpers/index/normal/entry_bottom.phtml +++ b/app/views/helpers/index/normal/entry_bottom.phtml @@ -48,6 +48,9 @@ $title = $this->entry->title() . ' ยท ' . $this->feed->name(); foreach (FreshRSS_Context::$user_conf->sharing as $share_options) { $share = FreshRSS_Share::get($share_options['type']); + if ($share === null) { + continue; + } $share_options['link'] = $link; $share_options['title'] = $title; $share->update($share_options); |