From e8b8485f560d581126490b25be3a052d0d4fd516 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 2 Oct 2006 06:02:01 +0100 Subject: [PATCH] getFeedUnread: add parent feed id when calculating counts for linked feeds --- functions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index f6a51642..3eaa5925 100644 --- a/functions.php +++ b/functions.php @@ -1542,7 +1542,8 @@ $match_part = "marked = true"; } else if ($n_feed > 0) { - $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE parent_feed = '$n_feed' + $result = db_query($link, "SELECT id FROM ttrss_feeds + WHERE parent_feed = '$n_feed' AND hidden = false AND owner_uid = " . $_SESSION["uid"]); @@ -1552,12 +1553,15 @@ while ($line = db_fetch_assoc($result)) { array_push($linked_feeds, "feed_id = " . $line["id"]); } + + array_push($linked_feeds, "feed_id = $n_feed"); $match_part = implode(" OR ", $linked_feeds); $result = db_query($link, "SELECT COUNT(int_id) AS unread FROM ttrss_user_entries - WHERE unread = true AND ($match_part) AND owner_uid = " . $_SESSION["uid"]); + WHERE unread = true AND ($match_part) + AND owner_uid = " . $_SESSION["uid"]); $unread = 0; -- 2.39.2