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

minor filter test dialog fixes

This commit is contained in:
Andrew Dolgov 2015-07-13 12:53:13 +03:00
parent 077004e470
commit 9638ec51b6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/pref/filters.php
View File

@ -78,12 +78,12 @@ class Pref_Filters extends Handler_Protected {
unset($rule["feed_id"]); 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"]); array_push($scope_qparts, "feed_id = " . $rule["feed_id"]);
} }
if (isset($rule["cat_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); array_push($filter["rules"], $rule);
@ -109,6 +109,8 @@ class Pref_Filters extends Handler_Protected {
$glue = $filter['match_any_rule'] ? " AND " : "OR "; $glue = $filter['match_any_rule'] ? " AND " : "OR ";
$scope_qpart = join($glue, $scope_qparts); $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) { while ($found < $limit && $offset < $limit * 10 && time() - $started < ini_get("max_execution_time") * 0.7) {
$result = db_query("SELECT ttrss_entries.id, $result = db_query("SELECT ttrss_entries.id,