From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 25 Jul 2006 05:02:42 +0000 (+0100)
Subject: fix adaptive behaviour for linked feeds
X-Git-Tag: schema_freeze_for_1.2.2~71
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=831ff047dde75862c01d8e4ebfe8b9f20bcb6925;p=tt-rss.git

fix adaptive behaviour for linked feeds
---

diff --git a/functions.php b/functions.php
index 9bd505d5..ea1cb711 100644
--- a/functions.php
+++ b/functions.php
@@ -1430,11 +1430,24 @@
 		$n_feed = sprintf("%d", $feed);
 
 		if ($is_cat) {
-			return getCategoryUnread($link, $feed);
+			return getCategoryUnread($link, $n_feed);		
 		} else if ($n_feed == -1) {
 			$match_part = "marked = true";
 		} else if ($feed > 0) {
-			$match_part = "feed_id = '$n_feed'";
+
+			$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE parent_feed = '$n_feed'");
+
+			if (db_num_rows($result) > 0) {
+				$linked_feeds = array();
+				while ($line = db_fetch_assoc($result)) {
+					array_push($linked_feeds, "feed_id = " . $line["id"]);
+				}
+				
+				$match_part = implode(" OR ", $linked_feeds);
+
+			} else {
+				$match_part = "feed_id = '$n_feed'";
+			}
 		} else if ($feed < -10) {
 			$label_id = -$feed - 11;