per-feed filters

1 files changed, 3 insertions, 1 deletions

diff --git a/functions.php b/functions.php
index f1c56e984..b9f33f2f6 100644
--- a/functions.php
+++ b/functions.php
@@ -217,7 +217,9 @@
 			$result = db_query($link, "SELECT reg_exp,
 				(SELECT name FROM ttrss_filter_types
 					WHERE id = filter_type) as name
-				FROM ttrss_filters WHERE owner_uid = $owner_uid");
+				FROM ttrss_filters WHERE 
+				owner_uid = $owner_uid AND
+				(feed_id IS NULL OR feed_id = '$feed')");
 
 			while ($line = db_fetch_assoc($result)) {
 				if (!$filters[$line["name"]]) $filters[$line["name"]] = array();