From 7726063cf25e120ac07caee76240695f6588adf8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 20 Feb 2013 09:34:00 +0400
Subject: [PATCH] fix php warning while testing filters with regexps too
complex for the database
---
include/functions.php | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/functions.php b/include/functions.php
index 7409ec76a..37cfd4844 100644
--- 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 {
--
GitLab