From 318260cc8a4b09403678a1a953fc7d646d3c268d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 16 Aug 2006 14:13:33 +0100 Subject: move outputFeedList to getFeedUnread, misc. hidden-related fixes --- functions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'functions.php') diff --git a/functions.php b/functions.php index 5a0e75c18..728d10f4e 100644 --- a/functions.php +++ b/functions.php @@ -1492,6 +1492,7 @@ } else if ($n_feed > 0) { $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE parent_feed = '$n_feed' + AND hidden = false AND owner_uid = " . $_SESSION["uid"]); if (db_num_rows($result) > 0) { @@ -1504,7 +1505,7 @@ $match_part = implode(" OR ", $linked_feeds); $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"]); $unread = 0; @@ -1520,6 +1521,7 @@ $match_part = "feed_id = '$n_feed'"; } } else if ($feed < -10) { + $label_id = -$feed - 11; $result = db_query($link, "SELECT sql_exp FROM ttrss_labels WHERE -- cgit v1.2.3