diff options
| -rw-r--r-- | classes/Feeds.php | 2 | ||||
| -rwxr-xr-x | js/Headlines.js | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/classes/Feeds.php b/classes/Feeds.php index b58c7f3b6..71379762f 100644 --- a/classes/Feeds.php +++ b/classes/Feeds.php @@ -2235,7 +2235,7 @@ class Feeds extends Handler_Protected { * @return array{0: string, 1: array<int, string>} [$search_query_part, $search_words] */ private static function _search_to_sql(string $search, string $search_language, int $owner_uid): array { - $keywords = str_getcsv(preg_replace('/(-?\w+)\:"(\w+)/', '"{$1}:{$2}', trim($search)), ' '); + $keywords = str_getcsv(preg_replace('/(-?\w+)\:"(\w+)/', '"{$1}:{$2}', trim($search)), ' ', '"', ''); $query_keywords = array(); $search_words = array(); $search_query_leftover = array(); diff --git a/js/Headlines.js b/js/Headlines.js index 603a502c6..74b8ca00d 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -644,12 +644,10 @@ const Headlines = { <i class='icon-syndicate material-icons'>rss_feed</i> </a> ${tb.site_url ? - `<a class="feed_title" target="_blank" href="${App.escapeHtml(tb.site_url)}" title="${tb.last_updated}">${tb.title}</a>` : - `<span class="feed_title">${tb.title}</span>`} - ${search_query ? - ` - <span class='cancel_search'>(<a href='#' onclick='Feeds.cancelSearch()'>${__("Cancel search")}</a>)</span> - ` : ''} + `<a class="feed_title" target="_blank" href="${App.escapeHtml(tb.site_url)}" title="${tb.last_updated}">${tb.title}</a>` : + `${search_query ? `<a href="#" onclick="Feeds.search(); return false" class="feed_title" title="${App.escapeHtml(search_query)}">${tb.title}</a> + <span class="cancel_search">(<a href="#" onclick="Feeds.cancelSearch(); return false">${__("Cancel search")}</a>)</span>` : + `<span class="feed_title">${tb.title}</span>`}`} ${tb.error ? `<i title="${App.escapeHtml(tb.error)}" class='material-icons icon-error'>error</i>` : ''} <span id='feed_current_unread' style='display: none'></span> </span> |