diff options
| author | Andrew Dolgov <[email protected]> | 2015-07-13 12:53:13 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-07-13 12:53:13 +0300 |
| commit | 9638ec51b67f5a49b9ed2f906d4b86d96e66e52f (patch) | |
| tree | f2060bd0b62a106bbd57e604eb6eb62f67046cca /classes | |
| parent | 077004e470bd4b695b03aa22c1dea4599bcc280f (diff) | |
minor filter test dialog fixes
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/pref/filters.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index de86d8d60..2c039e5df 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -78,12 +78,12 @@ class Pref_Filters extends Handler_Protected { unset($rule["feed_id"]); } - if (isset($rule["feed_id"])) { + if (isset($rule["feed_id"]) && $rule['feed_id'] > 0) { array_push($scope_qparts, "feed_id = " . $rule["feed_id"]); } if (isset($rule["cat_id"])) { - array_push($scope_qparts, "cat_id = " . $rule["feed_id"]); + array_push($scope_qparts, "cat_id = " . $rule["cat_id"]); } array_push($filter["rules"], $rule); @@ -109,6 +109,8 @@ class Pref_Filters extends Handler_Protected { $glue = $filter['match_any_rule'] ? " AND " : "OR "; $scope_qpart = join($glue, $scope_qparts); + if (!$scope_qpart) $scope_qpart = "true"; + while ($found < $limit && $offset < $limit * 10 && time() - $started < ini_get("max_execution_time") * 0.7) { $result = db_query("SELECT ttrss_entries.id, |