getLabelCounters: ignore hidden feeds

This commit is contained in:
Andrew Dolgov 2009-01-18 10:45:07 +01:00
parent b0f24af1da
commit 2923a53671
1 changed files with 6 additions and 4 deletions

View File

@ -2646,12 +2646,14 @@
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
$result = db_query($link, $result = db_query($link,
"SELECT id, caption, COUNT(unread) AS unread FROM ttrss_labels2 "SELECT ttrss_labels2.id, caption, COUNT(unread) AS unread FROM ttrss_labels2
LEFT JOIN ttrss_user_labels2 ON (label_id = id) LEFT JOIN ttrss_user_labels2 ON (label_id = ttrss_labels2.id)
LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND
unread = true AND unread = true AND
ttrss_user_entries.owner_uid = '$owner_uid') ttrss_user_entries.owner_uid = '$owner_uid'),ttrss_feeds
WHERE ttrss_labels2.owner_uid = '$owner_uid' WHERE ttrss_feeds.id = feed_id AND
hidden = false AND
ttrss_labels2.owner_uid = '$owner_uid'
GROUP BY id, caption"); GROUP BY id, caption");
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {