diff options
Diffstat (limited to 'utility/feedfetcher.php')
| -rw-r--r-- | utility/feedfetcher.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/utility/feedfetcher.php b/utility/feedfetcher.php index e97373836..3d4a5099c 100644 --- a/utility/feedfetcher.php +++ b/utility/feedfetcher.php @@ -159,15 +159,14 @@ class FeedFetcher implements IFeedFetcher { $feed->setUrlHash(md5($url)); $feed->setAdded($this->time->getTime()); - // get the favicon from the feed or the webpage - $favicon = $simplePieFeed->get_image_url(); - - if ($favicon) { - $feed->setFaviconLink($favicon); - } else { - $webFavicon = $this->faviconFetcher->fetch($feed->getLink()); - $feed->setFaviconLink($webFavicon); + // use the favicon from the page first since most feeds use a weird image + $favicon = $this->faviconFetcher->fetch($feed->getLink()); + + if (!$favicon) { + $favicon = $simplePieFeed->get_image_url(); } + + $feed->setFaviconLink($favicon); return $feed; } |