summaryrefslogtreecommitdiff
path: root/functions.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2006-08-16 14:13:33 +0100
committerAndrew Dolgov <[email protected]>2006-08-16 14:13:33 +0100
commit318260cc8a4b09403678a1a953fc7d646d3c268d (patch)
tree55754ecd6510353f3e28ef704b1a2385acf90ff3 /functions.php
parent3831db41c4b24050ad0ef2d0b58a5a042d4313bb (diff)
move outputFeedList to getFeedUnread, misc. hidden-related fixes
Diffstat (limited to 'functions.php')
-rw-r--r--functions.php4
1 files changed, 3 insertions, 1 deletions
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