diff options
author | Andrew Dolgov <[email protected]> | 2015-08-11 19:13:08 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-08-11 19:13:08 +0300 |
commit | 314956d440a0a42d0dc4ae7b6c8bcbb7fd80eeb9 (patch) | |
tree | 15a18ccc9647bd0f53699b085702ae4c389603f4 | |
parent | fb8a032a6b8e82a14997acf233aa17a8566c15e6 (diff) |
filter test dialog fixes for filters w/ many rules
-rw-r--r-- | classes/pref/filters.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 2c039e5df..a84340877 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -80,10 +80,10 @@ class Pref_Filters extends Handler_Protected { if (isset($rule["feed_id"]) && $rule['feed_id'] > 0) { array_push($scope_qparts, "feed_id = " . $rule["feed_id"]); - } - - if (isset($rule["cat_id"])) { + } else if (isset($rule["cat_id"])) { array_push($scope_qparts, "cat_id = " . $rule["cat_id"]); + } else { + array_push($scope_qparts, "true"); } array_push($filter["rules"], $rule); @@ -106,7 +106,7 @@ class Pref_Filters extends Handler_Protected { print "<div class=\"filterTestHolder\">"; print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">"; - $glue = $filter['match_any_rule'] ? " AND " : "OR "; + $glue = $filter['match_any_rule'] ? " OR " : " AND "; $scope_qpart = join($glue, $scope_qparts); if (!$scope_qpart) $scope_qpart = "true"; |