diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 3211987ce..794916c87 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1545,14 +1545,14 @@
AND owner_uid = '$owner_uid') $search_qpart
ORDER BY subscribers DESC LIMIT $limit"); */
- $result = db_query($link, "SELECT feed_url, title, SUM(subscribers) AS subscribers FROM
- (SELECT feed_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
- SELECT feed_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
+ $result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+ (SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
+ SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
WHERE
(SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = qqq.feed_url
AND owner_uid = '$owner_uid') $search_qpart
- GROUP BY feed_url, title ORDER BY subscribers DESC LIMIT $limit");
+ GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
} else if ($mode == 2) {
$result = db_query($link, "SELECT *,
@@ -1574,66 +1574,33 @@
if ($mode == 1) {
- $feed_url = $line["feed_url"];
+ $feed_url = htmlspecialchars($line["feed_url"]);
+ $site_url = htmlspecialchars($line["site_url"]);
$subscribers = $line["subscribers"];
- $det_result = db_query($link, "SELECT site_url,title,id
- FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
-
- $details = db_fetch_assoc($det_result);
-
- $icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "";
- } else {
- $feed_icon = "
";
- }
-
$check_box = "";
$class = ($feedctr % 2) ? "even" : "odd";
- $feed_url = htmlspecialchars($line["feed_url"]);
+ $site_url = "
+ ".
+ htmlspecialchars($line["title"])."";
- if ($details["site_url"]) {
- $site_url = "
-
";
- } else {
- $site_url = "";
- }
-
- $feed_url = "
";
+ $feed_url = "
";
- $rv .= "