From 1cd9b3c866e998e017873eb8b4f08864c4c5f043 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 29 Apr 2019 21:15:49 +0300 Subject: prevent a fatal error on an invalid tsquery syntax --- classes/feeds.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'classes/feeds.php') diff --git a/classes/feeds.php b/classes/feeds.php index 41251a408..2481ac6b5 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1434,6 +1434,17 @@ class Feeds extends Handler_Protected { if (!$search_query_part) { list($search_query_part, $search_words) = search_to_sql($search, $search_language); } + + if (DB_TYPE == "pgsql") { + $test_sth = $pdo->prepare("select $search_query_part from ttrss_entries limit 1"); + try { + $test_sth->execute(); + } catch (PDOException $e) { + // looks like tsquery syntax is invalid + $search_query_part = "false"; + } + } + $search_query_part .= " AND "; } else { $search_query_part = ""; -- cgit v1.2.3