Skip to content

fix no favicon for rss feeds #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtojnar merged 1 commit into from
Apr 15, 2017
Merged

fix no favicon for rss feeds #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions helpers/ContentLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ protected function fetchIcon($icon, $newItem, &$lasticon) {
\F3::get('logger')->error('icon generation error: ' . $icon);
}
}
} else {
\F3::get('logger')->debug('no icon for this feed');
}

return $newItem;
Expand Down
4 changes: 2 additions & 2 deletions spouts/rss/feed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class feed extends \spouts\spout {
protected $htmlUrl = '';

/** @var string URL of the favicon */
protected $faviconUrl = '';
protected $faviconUrl = null;

//
// Iterator Interface
Expand Down Expand Up @@ -243,7 +243,7 @@ public function getContent() {
* @return string icon url
*/
public function getIcon() {
if (isset($this->faviconUrl)) {
if ($this->faviconUrl !== null) {
return $this->faviconUrl;
}

Expand Down