diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-06-05 13:48:34 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-06-05 13:48:34 +0200 |
| commit | afad1d11af812538fe01d274ac3b9311e033e5a6 (patch) | |
| tree | 4e8e19774c38431f4c8957c8681cd94a7bf7c875 /app/Models/Feed.php | |
| parent | 3da8b8b1f51323f92fed06eb21cccca153591271 (diff) | |
Fix type exception in loadCompleteContent (#1918)
* Fix type exception in loadCompleteContent
https://github.com/FreshRSS/FreshRSS/issues/1917
With some refactoring
* Changelog 1917
https://github.com/FreshRSS/FreshRSS/issues/1917
https://github.com/FreshRSS/FreshRSS/pull/1918
Diffstat (limited to 'app/Models/Feed.php')
| -rw-r--r-- | app/Models/Feed.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 7eb079f15..c8ccff09b 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -391,8 +391,11 @@ class FreshRSS_Feed extends Minz_Model { $date ? $date : time() ); $entry->_tags($tags); - // permet de récupérer le contenu des flux tronqués - $entry->loadCompleteContent($this->pathEntries()); + $entry->_feed($this); + if ($this->pathEntries != '') { + // Optionally load full content for truncated feeds + $entry->loadCompleteContent(); + } $entries[] = $entry; unset($item); |