valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cat filters always applying if set to uncategorized

This commit is contained in:
Andrew Dolgov 2013-08-29 09:24:24 +04:00
parent 5d4d591826
commit 34e55fe8d9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/functions.php
View File

@ -3411,6 +3411,11 @@
$cat_id = (int)getFeedCategory($feed_id); $cat_id = (int)getFeedCategory($feed_id);
if ($cat_id == 0)
$null_cat_qpart = "cat_id IS NULL OR";
else
$null_cat_qpart = "";
$result = db_query("SELECT * FROM ttrss_filters2 WHERE $result = db_query("SELECT * FROM ttrss_filters2 WHERE
owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title"); owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
@ -3426,7 +3431,7 @@
FROM ttrss_filters2_rules AS r, FROM ttrss_filters2_rules AS r,
ttrss_filter_types AS t ttrss_filter_types AS t
WHERE WHERE
(cat_id IS NULL OR cat_id IN ($check_cats)) AND ($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats)) AND
(feed_id IS NULL OR feed_id = '$feed_id') AND (feed_id IS NULL OR feed_id = '$feed_id') AND
filter_type = t.id AND filter_id = '$filter_id'"); filter_type = t.id AND filter_id = '$filter_id'");