From 978989bb7b7e7c959fb29352d4a471bd1dad5de2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 18 Aug 2015 12:04:19 +0300 Subject: [PATCH] shorten previous a bit --- include/rssfuncs.php | 3 +-- update.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 684f0866..476d12be 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -1017,8 +1017,7 @@ _debug("RID: $entry_ref_id, IID: $entry_int_id", $debug_enabled); if (DB_TYPE == "pgsql") { - $entry_content_spaces = str_replace('<', ' <', $entry_content); - $tsvector_combined = db_escape_string(mb_substr($entry_title . ' ' . strip_tags($entry_content_spaces), + $tsvector_combined = db_escape_string(mb_substr($entry_title . ' ' . strip_tags(str_replace('<', ' <', $entry_content)), 0, 1000000)); $tsvector_qpart = "tsvector_combined = to_tsvector('$feed_language', '$tsvector_combined'),"; diff --git a/update.php b/update.php index 25269bdc..0fa4db0d 100755 --- a/update.php +++ b/update.php @@ -347,8 +347,7 @@ $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit"); while ($line = db_fetch_assoc($result)) { - $content_separated = str_replace('<', ' <', $line['content']); - $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags($content_separated), + $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags(str_replace('<', ' <', $line['content'])), 0, 1000000)); db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]); -- 2.39.2