diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-06 23:06:25 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-06 23:06:25 +0200 |
| commit | 7c1c7226a3519d9f54c2bcdc288bb3a13c57479c (patch) | |
| tree | c0109e4309004e2c8f6daa5a514acb36425735e6 /app/views | |
| parent | 4a2581f00d7c2febb95ea3de8ec47f1d3917232c (diff) | |
| parent | 35dcb5e39aee8029fee541d5649456bc385cd649 (diff) | |
Merge branch 'sql-optimisation' into dev
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 5 | ||||
| -rw-r--r-- | app/views/helpers/view/reader_view.phtml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index 43e5c0cd2..1ebdb461e 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -53,7 +53,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { <?php } ?> </li> <?php } ?> - <?php $feed = $item->feed (true); ?> + <?php + $feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache + if (empty($feed)) $feed = $item->feed (true); + ?> <li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li> <li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li> <li class="item date"><?php echo $item->date (); ?></li> diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml index 46a65a4e3..7b1e2bca0 100644 --- a/app/views/helpers/view/reader_view.phtml +++ b/app/views/helpers/view/reader_view.phtml @@ -11,7 +11,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { <div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>"> <div class="flux_content"> <div class="content"> - <?php $feed = $item->feed (true); ?> + <?php + $feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache + if (empty($feed)) $feed = $item->feed (true); + ?> <a href="<?php echo $item->link (); ?>"> <img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span> </a> |