valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getFeedUnread: add parent feed id when calculating counts for linked feeds

This commit is contained in:
Andrew Dolgov 2006-10-02 06:02:01 +01:00
parent 525b61a237
commit e8b8485f56
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions.php
View File

@ -1542,7 +1542,8 @@
$match_part = "marked = true"; $match_part = "marked = true";
} else if ($n_feed > 0) { } 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 hidden = false
AND owner_uid = " . $_SESSION["uid"]); AND owner_uid = " . $_SESSION["uid"]);
@ -1552,12 +1553,15 @@
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
array_push($linked_feeds, "feed_id = " . $line["id"]); array_push($linked_feeds, "feed_id = " . $line["id"]);
} }
array_push($linked_feeds, "feed_id = $n_feed");
$match_part = implode(" OR ", $linked_feeds); $match_part = implode(" OR ", $linked_feeds);
$result = db_query($link, "SELECT COUNT(int_id) AS unread $result = db_query($link, "SELECT COUNT(int_id) AS unread
FROM ttrss_user_entries 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; $unread = 0;