diff --git a/classes/api.php b/classes/api.php
index aa5964200..c28d36524 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -633,7 +633,7 @@ class API extends Handler {
$unread = getFeedUnread($line["id"]);
- $has_icon = feed_has_icon($line['id']);
+ $has_icon = Feeds::feedHasIcon($line['id']);
if ($unread || !$unread_only) {
diff --git a/classes/counters.php b/classes/counters.php
index 54e4041f5..2de7d5a3a 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -183,7 +183,11 @@ class Counters {
$last_updated = make_local_datetime($line['last_updated'], false);
- $has_img = feed_has_icon($id);
+ if (Feeds::feedHasIcon($id)) {
+ $has_img = filemtime(Feeds::getIconFile($id));
+ } else {
+ $has_img = false;
+ }
if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
$last_updated = '';
diff --git a/classes/feeds.php b/classes/feeds.php
index 07dd2a600..b52b580f4 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -414,7 +414,7 @@ class Feeds extends Handler_Protected {
$entry_author = " — $entry_author";
}
- $has_feed_icon = feed_has_icon($feed_id);
+ $has_feed_icon = feeds::feedHasIcon($feed_id);
if ($has_feed_icon) {
$feed_icon_img = "";
@@ -537,20 +537,12 @@ class Feeds extends Handler_Protected {
if ($vfeed_group_enabled && $line["feed_title"]) {
if ($feed_id != $vgroup_last_feed) {
- $cur_feed_title = $line["feed_title"];
$vgroup_last_feed = $feed_id;
- $cur_feed_title = htmlspecialchars($cur_feed_title);
-
$vf_catchup_link = "".__('mark feed as read')."";
- $has_feed_icon = feed_has_icon($feed_id);
-
- if ($has_feed_icon) {
- $feed_icon_img = "
";
- } else {
- //$feed_icon_img = "
";
- }
+ $feed_icon_src = Feeds::getFeedIcon($feed_id);
+ $feed_icon_img = "
";
$reply['content'] .= "