diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:44:53 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:44:53 +0200 |
| commit | 008d6a704748f04687ecf14f587b986d2fe5eacd (patch) | |
| tree | 284e081b27bd79dec046320b6ec14f498ac5f951 /app/views | |
| parent | 73fe0eabbe4461ba8c6d24692ca05de0ac93de11 (diff) | |
| parent | 7627970862e03a9061ddced3423689e9dccd6f45 (diff) | |
Merge branch 'SqlOptimisation' of https://github.com/Alkarex/FreshRSS into Alkarex-SqlOptimisation
Conflicts:
app/controllers/feedController.php
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 fb4e60cf6..5b9f03cdd 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -42,7 +42,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"><?php echo $item->title (); ?></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> |