fix php warning while testing filters with regexps too complex for the database

12 years ago · 7726063cf2
parent acfbab375d
commit 7726063cf2
1 changed files with 8 additions and 4 deletions
--- a/include/functions.php
+++ b/include/functions.php
@ -2153,12 +2153,16 @@
 					ttrss_user_entries, ttrss_feeds, ttrss_feed_categories
 					WHERE $filter_query_part LIMIT 1", false);

-				$test = db_fetch_result($result, 0, "true_val");
+				if ($result) {
+					$test = db_fetch_result($result, 0, "true_val");

-				if (!$test) {
-					$filter_query_part = "false AND";
+					if (!$test) {
+						$filter_query_part = "false AND";
+					} else {
+						$filter_query_part .= " AND";
+					}
 				} else {
-					$filter_query_part .= " AND";
+					$filter_query_part = "false AND";
 				}

 			} else {