diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:24:49 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:25:20 +0100 |
| commit | 930026df2159b027bc035f4ed15c39a43eb0e9fe (patch) | |
| tree | 869efcd322b4bea510de7644508c86ce836dc011 /app/views/index/normal.phtml | |
| parent | 76358846abe2eba95668d66d3847cbdfe3f8bcdc (diff) | |
Fix bug with new file organisation
entry_bottom.phtml didn't find $feed variable. It's fixed now.
Diffstat (limited to 'app/views/index/normal.phtml')
| -rw-r--r-- | app/views/index/normal.phtml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index fd2289365..f2e1c5012 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -25,6 +25,15 @@ if (!empty($this->entries)) { continue; } + // We most likely already have the feed object in cache + $this->feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed()); + if ($this->feed == null) { + $this->feed = $this->entry->feed(true); + if ($this->feed == null) { + $this->feed = FreshRSS_Feed::example(); + } + } + if ($display_today && $this->entry->isDay(FreshRSS_Days::TODAY, $today)) { ?><div class="day" id="day_today"><?php echo _t('today'); |